diff --git a/.github/workflows/docker-build-api-executors-tag.yaml b/.github/workflows/docker-build-api-executors-tag.yaml
index f21277f1adb..ec71e564742 100644
--- a/.github/workflows/docker-build-api-executors-tag.yaml
+++ b/.github/workflows/docker-build-api-executors-tag.yaml
@@ -415,11 +415,6 @@ jobs:
             echo "Switched to release branch"
             cd ./scripts
             ./chart_releaser.sh --helm-chart-folder testkube-api --testkube-executor true --branch true
-
-#            git checkout main
-#            git merge "release-$RELEASE_VERSION"
-#            git push --set-upstream https://kubeshop-bot:$GH_PUSH_TOKEN@github.com/kubeshop/helm-charts  main
-#            git push origin -d "release-$RELEASE_VERSION"
           fi
 
         env:
diff --git a/Makefile b/Makefile
index 002d6325806..2058f7792d6 100644
--- a/Makefile
+++ b/Makefile
@@ -74,8 +74,9 @@ build-testkube-bin-intel:
 		-o "$(BIN_DIR)/kubectl-testkube" \
 		cmd/kubectl-testkube/main.go
 
+#make docker-build-api SLACK_BOT_CLIENT_ID=** SLACK_BOT_CLIENT_SECRET=** ANALYTICS_TRACKING_ID=** ANALYTICS_API_KEY=** SEGMENTIO_KEY=** CLOUD_SEGMENTIO_KEY=** DOCKER_BUILDX_CACHE_FROM=type=registry,ref=docker.io/kubeshop/testkube-api-server:latest
 docker-build-api:
-	docker build  --platform linux/x86_64 -t kubeshop/testkube-api-server:$(COMMIT)-dev -f build/api-server/Dockerfile .
+	goreleaser release -f goreleaser_files/.goreleaser-docker-build-api.yml --rm-dist --snapshot
 
 dev-install-local-executors:
 	kubectl apply --namespace testkube -f https://raw.githubusercontent.com/kubeshop/testkube-operator/main/config/samples/executor_v1_executor.yaml