diff --git a/alpine/packages/chronyd/etc/init.d/chronyd b/alpine/packages/chronyd/etc/init.d/chronyd
index fad9060f1..6dd5de3e3 100755
--- a/alpine/packages/chronyd/etc/init.d/chronyd
+++ b/alpine/packages/chronyd/etc/init.d/chronyd
@@ -56,6 +56,9 @@ start() {
 		"aws")
 			sed -i -e "s/^server [^ ]\+/server 0.amazon.pool.ntp.org/g" /etc/chrony/chrony.conf
 		;;
+		"gcp")
+			sed -i -e "s/^server [^ ]\+/server metadata.google.internal/g" /etc/chrony/chrony.conf
+		;;
 		"azure")
 			# TODO needs an ntp solution
 		;;
diff --git a/alpine/packages/diagnostics/etc/init.d/diagnostics b/alpine/packages/diagnostics/etc/init.d/diagnostics
index eee304a61..13f69ed29 100755
--- a/alpine/packages/diagnostics/etc/init.d/diagnostics
+++ b/alpine/packages/diagnostics/etc/init.d/diagnostics
@@ -18,6 +18,9 @@ start()
 		"azure")
 			DIAGNOSTICS_SERVER_FLAGS="-http"
 		;;
+		"gcp")
+			DIAGNOSTICS_SERVER_FLAGS="-http"
+		;;
 		"windows")
 			DIAGNOSTICS_SERVER_FLAGS="-hvsock"
 		;;
diff --git a/alpine/packages/gcp/etc/init.d/gcp-hostname b/alpine/packages/gcp/etc/init.d/gcp-hostname
index c9a6e69e8..39ee79624 100755
--- a/alpine/packages/gcp/etc/init.d/gcp-hostname
+++ b/alpine/packages/gcp/etc/init.d/gcp-hostname
@@ -27,8 +27,3 @@ start()
 
   eend 0
 }
-
-stop()
-{
-  [ "$(mobyplatform)" != "gcp" ] && exit 0
-}