diff --git a/Dockerfile.controller b/Dockerfile.controller
index 222e67f32..8878ece4c 100644
--- a/Dockerfile.controller
+++ b/Dockerfile.controller
@@ -1,3 +1,4 @@
-FROM registry.fedoraproject.org/fedora-minimal:34
+FROM registry.fedoraproject.org/fedora-minimal:37
+RUN microdnf install glibc -y
 COPY _out/hostpath-provisioner /
 CMD ["/hostpath-provisioner"]
diff --git a/Dockerfile.csi b/Dockerfile.csi
index 4c22d3fea..95d64fd45 100644
--- a/Dockerfile.csi
+++ b/Dockerfile.csi
@@ -1,4 +1,5 @@
-FROM registry.fedoraproject.org/fedora-minimal:34
+FROM registry.fedoraproject.org/fedora-minimal:37
+RUN microdnf install glibc -y
 COPY _out/hostpath-csi-driver /
 ENTRYPOINT ["/hostpath-csi-driver"]
 
diff --git a/hack/build-csi.sh b/hack/build-csi.sh
index 933b7d339..15692b334 100755
--- a/hack/build-csi.sh
+++ b/hack/build-csi.sh
@@ -18,4 +18,4 @@ script_dir="$(cd "$(dirname "$0")" && pwd -P)"
 source "${script_dir}"/common.sh
 setGoInProw $GOLANG_VER
 
-CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o _out/hostpath-csi-driver cmd/plugin/plugin.go
+CGO_ENABLED=1 go build -a -tags strictfipsruntime -ldflags '-extldflags' -o _out/hostpath-csi-driver cmd/plugin/plugin.go
diff --git a/hack/build-provisioner.sh b/hack/build-provisioner.sh
index 1be52bfcd..cb98ad1a5 100755
--- a/hack/build-provisioner.sh
+++ b/hack/build-provisioner.sh
@@ -17,4 +17,4 @@ script_dir="$(cd "$(dirname "$0")" && pwd -P)"
 source "${script_dir}"/common.sh
 setGoInProw $GOLANG_VER
 
-CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o _out/hostpath-provisioner cmd/provisioner/hostpath-provisioner.go
+CGO_ENABLED=1 go build -a -tags strictfipsruntime -ldflags '-extldflags' -o _out/hostpath-provisioner cmd/provisioner/hostpath-provisioner.go
diff --git a/tests/pvc_test.go b/tests/pvc_test.go
index 38f04da00..5bd15aa10 100644
--- a/tests/pvc_test.go
+++ b/tests/pvc_test.go
@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -168,7 +168,7 @@ func TestPVCSize(t *testing.T) {
 	dfString, err := RunNodeSSHCommand("node01", "df -Bk /var/hpvolumes | sed 1d")
 	Expect(err).ToNot(HaveOccurred())
 	Expect(dfString).ToNot(BeEmpty())
-	sizeQuantity := resource.MustParse(strings.ToLower(strings.Fields(dfString)[1]))
+	sizeQuantity := resource.MustParse(strings.Fields(dfString)[1] + "i")
 	int64Size, _ := sizeQuantity.AsInt64()
 	hostQuantity := resource.NewQuantity(int64(roundDownCapacityPretty(int64Size)), resource.BinarySI)
 	t.Logf("Reported size on host: %s", hostQuantity.String())