diff --git a/Makefile b/Makefile
index 7d918152..6c31a5d9 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,11 @@ GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),${COMMIT
 GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
 
-IMAGE_NAME_INIT        ?= quay.io/iovisor/kubectl-trace-init
-IMAGE_NAME             ?= quay.io/iovisor/kubectl-trace-bpftrace
+IMAGE_NAME_INIT ?= quay.io/iovisor/kubectl-trace-init
+IMAGE_NAME ?= quay.io/iovisor/kubectl-trace-bpftrace
 
-IMAGE_TRACERUNNER_BRANCH        := $(IMAGE_NAME):$(GIT_BRANCH_CLEAN)
-IMAGE_TRACERUNNER_COMMIT        := $(IMAGE_NAME):$(GIT_COMMIT)
+IMAGE_TRACERUNNER_BRANCH := $(IMAGE_NAME):$(GIT_BRANCH_CLEAN)
+IMAGE_TRACERUNNER_COMMIT := $(IMAGE_NAME):$(GIT_COMMIT)
 
 IMAGE_INITCONTAINER_BRANCH := $(IMAGE_NAME_INIT):$(GIT_BRANCH_CLEAN)
 IMAGE_INITCONTAINER_COMMIT := $(IMAGE_NAME_INIT):$(GIT_COMMIT)
diff --git a/build/Dockerfile.initcontainer b/build/Dockerfile.initcontainer
index f64db0a9..1fdbac24 100644
--- a/build/Dockerfile.initcontainer
+++ b/build/Dockerfile.initcontainer
@@ -1,12 +1,12 @@
 FROM alpine:3.8
 RUN apk add --update \
-  bash \
-  bc \
-  build-base \
-  curl \
-  libelf-dev \
-  linux-headers \
-  make
+    bash \
+    bc \
+    build-base \
+    curl \
+    libelf-dev \
+    linux-headers \
+    make
 
 WORKDIR /
 
diff --git a/build/Dockerfile.tracerunner b/build/Dockerfile.tracerunner
index cd5b9966..789d91ca 100644
--- a/build/Dockerfile.tracerunner
+++ b/build/Dockerfile.tracerunner
@@ -11,7 +11,7 @@ RUN make _output/bin/trace-runner
 FROM ubuntu:19.10
 ARG bpftraceversion=0.9.2-1
 RUN apt-get update && apt-get install -y bpftrace=${bpftraceversion} && \
-      rm -rf /var/lib/apt/lists/* && apt-get clean
+    rm -rf /var/lib/apt/lists/* && apt-get clean
 
 COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner