diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 2db8351c..27841c38 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -240,7 +240,7 @@ jobs:
       - name: Install Libraries
         run: |
           sudo apt update
-          sudo apt install libc-dev gcc-multilib build-essential musl-dev gcc -y
+          sudo apt install libc-dev gcc-multilib build-essential musl-dev gcc g++ -y
 
       - name: Setting ENV's
         run: |
diff --git a/Makefile b/Makefile
index 969d5938..859d4f5b 100644
--- a/Makefile
+++ b/Makefile
@@ -157,7 +157,15 @@ docker-manifest:
 		docker build -t statping/statping:v${VERSION}-$$arch --build-arg VERSION=${VERSION} --build-arg ARCH=$$arch .; \
 		docker push statping/statping:v${VERSION}-$$arch; \
 	done
-	docker manifest create statping/statping:latest statping/statping:v${VERSION}-amd64 statping/statping:v${VERSION}-386 statping/statping:v${VERSION}-arm statping/statping:v${VERSION}-arm64
+	docker manifest create statping/statping:v${VERSION} statping/statping:v${VERSION}-amd64 statping/statping:v${VERSION}-386 statping/statping:v${VERSION}-arm statping/statping:v${VERSION}-arm64
+	for arch in $(ARCHS);\
+	do \
+		echo "Docker Manifest v${VERSION} for linux-$$arch"; \
+		docker manifest annotate --os linux --arch $$arch statping/statping:v${VERSION}-$$arch; \
+	done
+	docker manifest push statping/statping:v${VERSION}
+    docker manifest create statping/statping:latest statping/statping:v${VERSION}-amd64 statping/statping:v${VERSION}-386 statping/statping:v${VERSION}-arm statping/statping:v${VERSION}-arm64
+	for arch in $(ARCHS);\
 	do \
 		echo "Docker Manifest v${VERSION} for linux-$$arch"; \
 		docker manifest annotate --os linux --arch $$arch statping/statping:v${VERSION}-$$arch; \