diff --git a/template/kubernetes-template.spec b/template/kubernetes-template.spec
index 193e53e..b87f799 100644
--- a/template/kubernetes-template.spec
+++ b/template/kubernetes-template.spec
@@ -223,10 +223,12 @@ source hack/lib/init.sh
 kube::golang::setup_env
 
 export KUBE_GIT_TREE_STATE="clean"
-export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v{version}
+export KUBE_GIT_VERSION=v%{version}
 export KUBE_EXTRA_GOPATH=$(pwd)/Godeps/_workspace
 
+# Use pie buildmode
+export GOFLAGS="-buildmode=pie"
+
 # Build each binary separately to generate a unique build-id.
 # Otherwise: Duplicate build-ids /builddir/build/BUILDROOT/.../usr/bin/kube-apiserver and /builddir/build/BUILDROOT/.../usr/bin/kubeadm
 make WHAT="cmd/kube-proxy"