diff --git a/general/package/go2rtc/files/go2rtc.yaml b/general/package/go2rtc/files/go2rtc.yaml
index f985ce24..e2c61d17 100644
--- a/general/package/go2rtc/files/go2rtc.yaml
+++ b/general/package/go2rtc/files/go2rtc.yaml
@@ -8,13 +8,13 @@ log:
   webrtc: fatal
 
 rtsp:
-    listen: ":8553"
+  listen: ":8553"
 
 webrtc:
   candidates:
     - stun:8555
 
 streams:
- openipc_jpeg: http://username:password@127.0.0.1/image.jpg
- openipc_rtsp-1: rtsp://username:password@127.0.0.1/stream=0
- openipc_rtsp-2: rtsp://username:password@127.0.0.1/stream=1
+  openipc_jpeg: http://username:password@127.0.0.1/image.jpg
+  openipc_rtsp-1: rtsp://username:password@127.0.0.1/stream=0
+  openipc_rtsp-2: rtsp://username:password@127.0.0.1/stream=1
diff --git a/general/package/go2rtc/go2rtc.mk b/general/package/go2rtc/go2rtc.mk
index f9dfd156..97b13fce 100644
--- a/general/package/go2rtc/go2rtc.mk
+++ b/general/package/go2rtc/go2rtc.mk
@@ -15,11 +15,23 @@ GO2RTC_DEPENDENCIES = host-go host-upx
 GO2RTC_GO_LDFLAGS = -s -w
 
 define GO2RTC_BUILD_CMDS
-	(cd $(@D); \
-	CGO_ENABLED=0 \
-	GOOS=linux \
-	GOARCH=mipsle \
-	go build -ldflags "$(GO2RTC_GO_LDFLAGS)")
+	GOARCH=$$( \
+		case $(BR2_ARCH) in \
+			x86) echo 386 ;; \
+			x86_64) echo amd64 ;; \
+			arm) echo arm ;; \
+			aarch64) echo arm64 ;; \
+			mips) echo mips ;; \
+			mipsel) echo mipsle ;; \
+			*) echo "Unsupported architecture: $(BR2_ARCH)" && exit 1 ;; \
+		esac \
+	); \
+	echo "Building for GOARCH: $$GOARCH"; \
+		(cd $(@D); \
+		CGO_ENABLED=0 \
+		GOOS=linux \
+		GOARCH=$$GOARCH \
+		go build -ldflags "$(GO2RTC_GO_LDFLAGS)")
 endef
 
 define GO2RTC_INSTALL_TARGET_CMDS