diff --git a/config/patches/prometheus/rpi-correct-platform.patch b/config/patches/prometheus/rpi-correct-platform.patch
new file mode 100644
index 0000000000000000000000000000000000000000..34e42e93f1f0629e2576ceab6519580bede4dbb9_Y29uZmlnL3BhdGNoZXMvcHJvbWV0aGV1cy9ycGktY29ycmVjdC1wbGF0Zm9ybS5wYXRjaA==
--- /dev/null
+++ b/config/patches/prometheus/rpi-correct-platform.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.common b/Makefile.common
+index 0acfb9d80..8fede188e 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -40,7 +40,7 @@ PROMU        := $(FIRST_GOPATH)/bin/promu
+ pkgs          = ./...
+ 
+ ifeq (arm, $(GOHOSTARCH))
+-	GOHOSTARM ?= $(shell GOARM= $(GO) env GOARM)
++	GOHOSTARM ?= $(shell GOARM= $(GO) env GOARM | cut -d, -f1)
+ 	GO_BUILD_PLATFORM ?= $(GOHOSTOS)-$(GOHOSTARCH)v$(GOHOSTARM)
+ else
+ 	GO_BUILD_PLATFORM ?= $(GOHOSTOS)-$(GOHOSTARCH)
diff --git a/config/software/prometheus.rb b/config/software/prometheus.rb
index 86bfded8d440b6da7a787926c5db72e12c682e84_Y29uZmlnL3NvZnR3YXJlL3Byb21ldGhldXMucmI=..34e42e93f1f0629e2576ceab6519580bede4dbb9_Y29uZmlnL3NvZnR3YXJlL3Byb21ldGhldXMucmI= 100644
--- a/config/software/prometheus.rb
+++ b/config/software/prometheus.rb
@@ -44,6 +44,8 @@
 
   prom_version = Prometheus::VersionFlags.new(version)
 
+  patch source: 'rpi-correct-platform.patch' if OhaiHelper.raspberry_pi?
+
   make 'build', env: env, cwd: cwd
   command "go build -tags netgo,builtinassets,stringlabels -ldflags '#{prom_version.print_ldflags}' ./cmd/prometheus", env: env, cwd: cwd