diff --git a/Dockerfile.add-backend b/Dockerfile.add-backend
deleted file mode 100644
index ef194b53..00000000
--- a/Dockerfile.add-backend
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM ghcr.io/spiffe/spire-server:1.1.3
-ENTRYPOINT ["/opt/spire/run_server.sh"]
-RUN apk add curl
-COPY bin/tornjak-backend tornjak-backend
-COPY sample-keys sample-keys
-# Add init
-COPY run_server.sh run_server.sh
-
-# add a version link to the image description
-ARG version
-ARG github_sha
-LABEL org.opencontainers.image.description="Tornjak backend + SPIRE server 1.1.3: https://github.com/spiffe/tornjak/releases/tag/$version" \
-      org.opencontainers.image.source="https://github.com/spiffe/tornjak" \
-      org.opencontainers.image.documentation="https://github.com/spiffe/tornjak/tree/main/docs" 
-# create env. variables with the build details
-ENV VERSION=$version
-ENV GITHUB_SHA=$github_sha
diff --git a/Makefile b/Makefile
index ca5ea49e..5745535a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ bin/tornjak-backend: $(GO_FILES) vendor
 	# Build hack because of flake of imported go module
 	docker run --rm -v "${PWD}":/usr/src/myapp -w /usr/src/myapp -e GOOS=linux -e GOARCH=amd64 golang:1.16 /bin/sh -c "go build --tags 'sqlite_json' tornjak-backend/cmd/agent/agent.go; go build --tags 'sqlite_json' -mod=vendor -ldflags '-s -w -linkmode external -extldflags "-static"' -o bin/tornjak-backend tornjak-backend/cmd/agent/agent.go"
 
-
+# build binary for Tornjak manager backend (bin/tornjak-manager)
 bin/tornjak-manager: $(GO_FILES) vendor
 	# Build hack because of flake of imported go module
 	docker run --rm -v "${PWD}":/usr/src/myapp -w /usr/src/myapp -e GOOS=linux -e GOARCH=amd64 golang:1.16 /bin/sh -c "go build --tags 'sqlite_json' -o tornjak-manager tornjak-backend/cmd/manager/manager.go; go build --tags 'sqlite_json' -mod=vendor -ldflags '-s -w -linkmode external -extldflags "-static"' -o bin/tornjak-manager tornjak-backend/cmd/manager/manager.go"