diff --git a/Dockerfile b/Dockerfile
index b34a8399..647c7c93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,12 @@
 # Build Go Binary
-FROM golang:1.22.1-alpine AS build
-ARG GO_LDFLAGS
+FROM golang:1.22.1 AS build
 
 WORKDIR /app
 COPY ["go.mod", "go.sum", "./"]
 RUN go mod download
 
 COPY . .
-RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags "${GO_LDFLAGS} -extldflags '-static'" -o cloudcost-exporter ./cmd/exporter
+RUN make build-binary
 
 # Build Image
 FROM scratch
diff --git a/Makefile b/Makefile
index 46be9653..0b9d5db2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,14 @@
 .PHONY: build-image build-binary build test push push-dev
 
-current_makefile_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+VERSION=$(shell git describe --tags --dirty --always)
 
-# deployment_tools/docker/image-tag.sh
-VERSION=dev-$(shell date +%Y-%m-%d)-$(shell git rev-parse --short HEAD)
-
-# deployment_tools/docker/common.inc
-IMAGE_PREFIX=us.gcr.io/kubernetes-dev
+IMAGE_PREFIX=grafana
 
 IMAGE_NAME=cloudcost-exporter
 IMAGE_NAME_LATEST=${IMAGE_PREFIX}/${IMAGE_NAME}:latest
 IMAGE_NAME_VERSION=$(IMAGE_PREFIX)/$(IMAGE_NAME):$(VERSION)
 
 WORKFLOW_TEMPLATE=cloudcost-exporter
-WORKFLOW_NAMESPACE=capacity-cd
 
 PROM_VERSION_PKG ?= github.com/prometheus/common/version
 BUILD_USER   ?= $(shell whoami)@$(shell hostname)
@@ -26,7 +21,7 @@ build-image:
 	docker build --build-arg GO_LDFLAGS="$(GO_LDFLAGS)" -t $(IMAGE_PREFIX)/$(IMAGE_NAME) -t $(IMAGE_NAME_VERSION) .
 
 build-binary:
-	go build -v -ldflags "$(GO_LDFLAGS)" -o cloudcost-exporter ./cmd/exporter
+	CGO_ENABLED=0 go build -v -ldflags "$(GO_LDFLAGS)" -o cloudcost-exporter ./cmd/exporter
 
 build: build-binary build-image