diff --git a/apps/face_detection/BUILD b/apps/face_detection/BUILD
index d59b2e6..ebeb5b5 100644
--- a/apps/face_detection/BUILD
+++ b/apps/face_detection/BUILD
@@ -4,19 +4,19 @@
 # TODO(lekva): figure out how to build py_binary with pip dependencies and
 # migrate off docker_image rule
 docker_image(
-	name = "push_to_dev",
-	registry = "localhost:30500",
-	image = "giolekva/face-detector",
-	tag = "latest",
-	dockerfile = "Dockerfile",
-	srcs = glob(["*.py"]) + [
-	     "haarcascade_frontalface_default.xml",
-	],
+    name = "push_to_dev",
+    srcs = glob(["*.py"]) + [
+        "haarcascade_frontalface_default.xml",
+    ],
+    dockerfile = "Dockerfile",
+    image = "giolekva/face-detector",
+    registry = "localhost:30500",
+    tag = "latest",
 )
 
 pkg_tar(
-	name = "chart",
-	srcs = glob(["chart/**"]),
-	extension = "tar.gz",
-	strip_prefix = "./chart",
+    name = "chart",
+    srcs = glob(["chart/**"]),
+    extension = "tar.gz",
+    strip_prefix = "./chart",
 )
diff --git a/apps/minio/BUILD b/apps/minio/BUILD
index 1fc1992..ad6af19 100644
--- a/apps/minio/BUILD
+++ b/apps/minio/BUILD
@@ -1,8 +1,8 @@
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 
 pkg_tar(
-	name = "chart",
-	srcs = glob(["chart/**"]),
-	extension = "tar.gz",
-	strip_prefix = "./chart",
+    name = "chart",
+    srcs = glob(["chart/**"]),
+    extension = "tar.gz",
+    strip_prefix = "./chart",
 )
diff --git a/apps/minio/importer/BUILD b/apps/minio/importer/BUILD
index b931f11..09d5da2 100644
--- a/apps/minio/importer/BUILD
+++ b/apps/minio/importer/BUILD
@@ -1,44 +1,44 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push", "container_image")
+load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_push")
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 
 go_library(
-	name = "lib",
-	srcs = ["importer.go"],
-	importpath = "github.com/giolekva/pcloud/apps/minio/importer",
-	deps = [
-	     "@com_github_itaysk_regogo//:go_default_library",
-	     "@com_github_golang_glog//:go_default_library",
-	],
+    name = "lib",
+    srcs = ["importer.go"],
+    importpath = "github.com/giolekva/pcloud/apps/minio/importer",
+    deps = [
+        "@com_github_golang_glog//:go_default_library",
+        "@com_github_itaysk_regogo//:go_default_library",
+    ],
 )
 
 go_binary(
-	name = "importer",
-	srcs = ["main.go"],
-	deps = [
-	     ":lib",
-	],
+    name = "importer",
+    srcs = ["main.go"],
+    deps = [
+        ":lib",
+    ],
 )
 
 container_image(
     name = "container",
     base = "@alpine_base//image",
-    files = [":importer"],
     cmd = ["importer"],
+    files = [":importer"],
 )
 
 container_push(
-   name = "push_to_dev",
-   image = ":container",
-   format = "Docker",
-   registry = "localhost:30500",
-   repository = "giolekva/minio-importer",
-   tag = "latest",
+    name = "push_to_dev",
+    format = "Docker",
+    image = ":container",
+    registry = "localhost:30500",
+    repository = "giolekva/minio-importer",
+    tag = "latest",
 )
 
 pkg_tar(
-	name = "chart",
-	srcs = glob(["chart/**"]),
-	extension = "tar.gz",
-	strip_prefix = "./chart",
+    name = "chart",
+    srcs = glob(["chart/**"]),
+    extension = "tar.gz",
+    strip_prefix = "./chart",
 )
diff --git a/apps/photos-ui/BUILD b/apps/photos-ui/BUILD
index fa822db..1601870 100644
--- a/apps/photos-ui/BUILD
+++ b/apps/photos-ui/BUILD
@@ -1,55 +1,55 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push", "container_image")
+load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_push")
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 
 filegroup(
     name = "data",
     srcs = glob([
-	     "static/**",
-	     "*.html",
-	]),
+        "static/**",
+        "*.html",
+    ]),
 )
 
 go_binary(
-	name = "photos_ui",
-	srcs = ["main.go"],
-	data = [":data"],
-	deps = [
-	     "@io_bazel_rules_go//go/tools/bazel:bazel",
-	],
+    name = "photos_ui",
+    srcs = ["main.go"],
+    data = [":data"],
+    deps = [
+        "@io_bazel_rules_go//go/tools/bazel",
+    ],
 )
 
 container_image(
     name = "container",
     base = "@alpine_base//image",
-    files = [
-    	  ":photos_ui",
-	  ":data",
-	  "photos_ui.runfiles_manifest",
-    ],
-    data_path = "/",
     cmd = ["/photos_ui"],
+    data_path = "/",
     env = {
-    	"RUNFILES_DIR": "/",
-    	"RUNFILES_MANIFEST_FILE": "/photos_ui.runfiles_manifest",
+        "RUNFILES_DIR": "/",
+        "RUNFILES_MANIFEST_FILE": "/photos_ui.runfiles_manifest",
     },
+    files = [
+        "photos_ui.runfiles_manifest",
+        ":data",
+        ":photos_ui",
+    ],
     symlinks = {
-    	     "/photos_ui": "/apps/photos-ui/photos_ui_/photos_ui",
+        "/photos_ui": "/apps/photos-ui/photos_ui_/photos_ui",
     },
 )
 
 container_push(
-   name = "push_to_dev",
-   image = ":container",
-   format = "Docker",
-   registry = "localhost:30500",
-   repository = "giolekva/photos-ui",
-   tag = "latest",
+    name = "push_to_dev",
+    format = "Docker",
+    image = ":container",
+    registry = "localhost:30500",
+    repository = "giolekva/photos-ui",
+    tag = "latest",
 )
 
 pkg_tar(
-	name = "chart",
-	srcs = glob(["chart/**"]),
-	extension = "tar.gz",
-	strip_prefix = "./chart",
+    name = "chart",
+    srcs = glob(["chart/**"]),
+    extension = "tar.gz",
+    strip_prefix = "./chart",
 )
diff --git a/apps/rpuppy/BUILD b/apps/rpuppy/BUILD
index 4d92193..2e29fc8 100644
--- a/apps/rpuppy/BUILD
+++ b/apps/rpuppy/BUILD
@@ -1,35 +1,35 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push", "container_image")
+load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_push")
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 
 go_binary(
-	name = "rpuppy",
-	srcs = ["main.go"],
-	deps = [
-	     "@com_github_itaysk_regogo//:go_default_library",
-	],
+    name = "rpuppy",
+    srcs = ["main.go"],
+    deps = [
+        "@com_github_itaysk_regogo//:go_default_library",
+    ],
 )
 
 container_image(
     name = "container",
     # References container_pull from WORKSPACE (above)
     base = "@alpine_base//image",
-    files = [":rpuppy"],
     cmd = ["rpuppy"],
+    files = [":rpuppy"],
 )
 
 container_push(
-   name = "push_to_dev",
-   image = ":container",
-   format = "Docker",
-   registry = "localhost:30500",
-   repository = "giolekva/rpuppy",
-   tag = "latest",
+    name = "push_to_dev",
+    format = "Docker",
+    image = ":container",
+    registry = "localhost:30500",
+    repository = "giolekva/rpuppy",
+    tag = "latest",
 )
 
 pkg_tar(
-	name = "chart",
-	srcs = glob(["chart/**"]),
-	extension = "tar.gz",
-	strip_prefix = "./chart",
+    name = "chart",
+    srcs = glob(["chart/**"]),
+    extension = "tar.gz",
+    strip_prefix = "./chart",
 )