diff --git a/makefiles/build.mk b/makefiles/build.mk
index 21720b4..12c9c26 100644
--- a/makefiles/build.mk
+++ b/makefiles/build.mk
@@ -1,4 +1,5 @@
 ## BUILD
+GO_BUILD=go build -ldflags="-X 'github.com/katenary/katenary/internal/generator.Version=$(VERSION)'" -trimpath -o $(OUTPUT) ./cmd/katenary
 
 # Simply build the binary for the current OS and architecture
 build: pull katenary
@@ -14,11 +15,10 @@ ifeq ($(GO),local)
 	@echo "=> Build on host using go"
 	$(GO_BUILD)
 else
-	@echo "=> Build in container using" $(CTN)
-	@$(GO_OCI) $(GO_BUILD)
+	echo "=> Build in container using" $(CTN)
+	$(GO_OCI) $(GO_BUILD)
 endif
 
-
 # Make dist, build executables for all platforms, sign them, and compress them with upx if possible.
 # Also generate the windows installer.
 binaries: prepare $(BINARIES)
diff --git a/makefiles/containers.mk b/makefiles/containers.mk
index 22ee75f..dfe4f34 100644
--- a/makefiles/containers.mk
+++ b/makefiles/containers.mk
@@ -27,7 +27,6 @@ else
 		$(CTN_USERMAP) \
 		$(PKG_OCI_IMAGE)
 endif
-GO_BUILD=go build -ldflags="-X 'katenary/generator.Version=$(VERSION)'" -o $(OUTPUT)  ./cmd/katenary
 BUILD_IMAGE=docker.io/golang:$(GOVERSION)
 	
 GO_OCI:=$(CTN) run --rm -it \
@@ -45,3 +44,9 @@ packager-oci-image:
 builder-oci-image:
 	@$(CTN) build -t go-builder:$(GOVERSION) ./oci/builder \
 		--build-arg GOVERSION=$(GOVERSION) 1>/dev/null
+katenary-oci:
+	$(CTN) build -f oci/katenary/Containerfile -t katenary:$(VERSION) \
+		--build-arg GOVERSION=$(GOVERSION) \
+		--build-arg VERSION=$(VERSION) \
+		./
+	$(CTN) tag katenary:$(VERSION) katenary:latest