diff --git a/Makefile b/Makefile
index 8b937dc1..fe6c6139 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,10 @@ 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      ?= quay.io/fntlnz/kubectl-trace-bpftrace
-IMAGE_NAME_BASE ?= quay.io/fntlnz/kubectl-trace-bpftrace-base
+IMAGE_NAME      ?= quay.io/iovisor/kubectl-trace-bpftrace
+IMAGE_NAME_BASE ?= quay.io/iovisor/kubectl-trace-bpftrace-base
 
-IMAGE_NAME_INIT ?= quay.io/fntlnz/kubectl-trace-init
+IMAGE_NAME_INIT ?= quay.io/iovisor/kubectl-trace-init
 
 IMAGE_TRACERUNNER_BRANCH := $(IMAGE_NAME):$(GIT_BRANCH_CLEAN)
 IMAGE_TRACERUNNER_COMMIT := $(IMAGE_NAME):$(GIT_COMMIT)
@@ -59,11 +59,15 @@ image/build:
 image/push:
 	$(DOCKER) push $(IMAGE_TRACERUNNER_BRANCH)
 	$(DOCKER) push $(IMAGE_TRACERUNNER_COMMIT)
+	$(DOCKER) push $(IMAGE_INITCONTAINER_BRANCH)
+	$(DOCKER) push $(IMAGE_INITCONTAINER_COMMIT)
 
 .PHONY: image/latest
 image/latest:
 	$(DOCKER) tag $(IMAGE_TRACERUNNER_COMMIT) $(IMAGE_TRACERUNNER_LATEST)
 	$(DOCKER) push $(IMAGE_TRACERUNNER_LATEST)
+	$(DOCKER) tag $(IMAGE_INITCONTAINER_COMMIT) $(IMAGE_INITCONTAINER_LATEST)
+	$(DOCKER) push $(IMAGE_INITCONTAINER_LATEST)
 
 .PHONY: test
 test:
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index eede7dba..7d8aa5ae 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -22,9 +22,9 @@ import (
 
 var (
 	// ImageNameTag represents the default tracerunner image
-	ImageNameTag = "quay.io/fntlnz/kubectl-trace-bpftrace:latest"
+	ImageNameTag = "quay.io/iovisor/kubectl-trace-bpftrace:latest"
 	// InitImageNameTag represents the default init container image
-	InitImageNameTag = "quay.io/fntlnz/kubectl-trace-init:latest"
+	InitImageNameTag = "quay.io/iovisor/kubectl-trace-init:latest"
 )
 
 var (