diff --git a/_constraints b/_constraints
index 7d85af4..68ddda6 100644
--- a/_constraints
+++ b/_constraints
@@ -2,7 +2,7 @@
   <!-- CDI needs larger disk for builds -->
   <hardware>
     <disk>
-      <size unit="G">6</size>
+      <size unit="G">10</size>
     </disk>
   </hardware>
 </constraints>
diff --git a/containerized-data-importer-rpmlintrc b/containerized-data-importer-rpmlintrc
new file mode 100644
index 0000000..e160ef6
--- /dev/null
+++ b/containerized-data-importer-rpmlintrc
@@ -0,0 +1 @@
+addFilter("statically-linked-binary")
diff --git a/containerized-data-importer.changes b/containerized-data-importer.changes
index 1956149..e3dfae9 100644
--- a/containerized-data-importer.changes
+++ b/containerized-data-importer.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Oct 15 13:41:00 UTC 2022 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Build tools/cdi-containerimage-server with CGO_ENABLED=0
+
 -------------------------------------------------------------------
 Mon Oct 10 07:07:51 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/containerized-data-importer.spec b/containerized-data-importer.spec
index 707a02c..d3c568e 100644
--- a/containerized-data-importer.spec
+++ b/containerized-data-importer.spec
@@ -26,6 +26,7 @@ URL:            https://github.com/kubevirt/containerized-data-importer
 Source0:        %{name}-%{version}.tar.gz
 Source1:        cdi_containers_meta
 Source2:        cdi_containers_meta.service
+Source100:      %{name}-rpmlintrc
 BuildRequires:  golang-packaging
 BuildRequires:  libnbd-devel
 BuildRequires:  pkgconfig
@@ -177,13 +178,13 @@ sed -i"" \
     %{S:1}
 
 export GOPATH=%{_builddir}/go
-export GOFLAGS="-buildmode=pie -mod=vendor"
-env \
-CDI_SOURCE_DATE_EPOCH="$(date -r LICENSE +%s)" \
-CDI_GIT_COMMIT='v%{version}' \
-CDI_GIT_VERSION='v%{version}' \
-CDI_GIT_TREE_STATE="clean" \
-./hack/build/build-go.sh build \
+export GOFLAGS="-mod=vendor"
+export CDI_SOURCE_DATE_EPOCH="$(date -r LICENSE +%s)"
+export CDI_GIT_COMMIT='v%{version}'
+export CDI_GIT_VERSION='v%{version}'
+export CDI_GIT_TREE_STATE="clean"
+
+GOFLAGS="-buildmode=pie ${GOFLAGS}" ./hack/build/build-go.sh build \
     cmd/cdi-apiserver \
     cmd/cdi-cloner \
     cmd/cdi-controller \
@@ -191,11 +192,15 @@ CDI_GIT_TREE_STATE="clean" \
     cmd/cdi-uploadproxy \
     cmd/cdi-uploadserver \
     cmd/cdi-operator \
-    tools/cdi-containerimage-server \
     tools/cdi-image-size-detection \
     tools/cdi-source-update-poller \
     %{nil}
 
+# Disable cgo to build static binaries, so they can run on scratch images
+CGO_ENABLED=0 ./hack/build/build-go.sh build \
+    tools/cdi-containerimage-server \
+    %{nil}
+
 env DOCKER_PREFIX=$reg_path DOCKER_TAG=%{version}-%{release} ./hack/build/build-manifests.sh
 
 %install