diff --git a/WORKSPACE b/WORKSPACE
index b44c47f..293bd79 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -50,6 +50,17 @@
 
 _go_image_repos()
 
+## Containier Base Images
+
+load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
+
+container_pull(
+    name = "alpine_base",
+    registry = "docker.io",
+    repository = "alpine",
+    digest = "sha256:4e01ddea8def856ba9fee17668fa0b2e45a8bc78127b7ab6cf921f6d6fd86ac9",
+)
+
 ## External Dependencies
 
 go_repository(
diff --git a/apps/rpuppy/BUILD b/apps/rpuppy/BUILD
index 471b88f..abbaaa2 100644
--- a/apps/rpuppy/BUILD
+++ b/apps/rpuppy/BUILD
@@ -1,5 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary")
-load("@io_bazel_rules_docker//go:image.bzl", "go_image")
+load("@io_bazel_rules_docker//container:container.bzl", "container_push", "container_image")
 
 go_binary(
 	name = "rpuppy",
@@ -9,7 +9,19 @@
 	],
 )
 
-go_image(
-	name = "rpuppy_image",
-	binary = ":rpuppy",
+container_image(
+    name = "container",
+    # References container_pull from WORKSPACE (above)
+    base = "@alpine_base//image",
+    files = [":rpuppy"],
+    cmd = ["rpuppy"],
+)
+
+container_push(
+   name = "push_to_dev",
+   image = ":container",
+   format = "Docker",
+   registry = "localhost:30500",
+   repository = "giolekva/rpuppy-arm",
+   tag = "latest",
 )