diff --git a/apps/minio/BUILD b/apps/minio/BUILD
new file mode 100644
index 0000000..1fc1992
--- /dev/null
+++ b/apps/minio/BUILD
@@ -0,0 +1,8 @@
+load("@rules_pkg//:pkg.bzl", "pkg_tar")
+
+pkg_tar(
+	name = "chart",
+	srcs = glob(["chart/**"]),
+	extension = "tar.gz",
+	strip_prefix = "./chart",
+)
diff --git a/apps/minio/chart/templates/pcloud/Actions.yaml b/apps/minio/chart/templates/pcloud/Actions.yaml
index 6873de0..5333deb 100644
--- a/apps/minio/chart/templates/pcloud/Actions.yaml
+++ b/apps/minio/chart/templates/pcloud/Actions.yaml
@@ -10,7 +10,7 @@
     spec:
       containers:
       - name: create-bucket-with-webhook
-        image: giolekva/minio-mc-arm64:latest
+        image: {{ .Values.minio_mc.image.repository }}:{{ .Values.minio_mc.image.tag }}
         imagePullPolicy: Always
         env:
         - name: MINIO_ADDR
diff --git a/apps/minio/chart/values.yaml b/apps/minio/chart/values.yaml
index 79a3fca..b366190 100644
--- a/apps/minio/chart/values.yaml
+++ b/apps/minio/chart/values.yaml
@@ -5,8 +5,13 @@
   existingSecret: minio-creds
   fullnameOverride: minio
   image:
-    repository: giolekva/minio-arm
+    repository: minio/minio
     tag: latest
     pullPolicy: Always
   persistence:
     size: 1Gi
+minio_mc:
+  image:
+    repository: minio/mc
+    tag: latest
+    pullPolicy: Always
diff --git a/apps/minio/importer/BUILD b/apps/minio/importer/BUILD
index c94f6ac..b931f11 100644
--- a/apps/minio/importer/BUILD
+++ b/apps/minio/importer/BUILD
@@ -40,6 +40,5 @@
 	name = "chart",
 	srcs = glob(["chart/**"]),
 	extension = "tar.gz",
-	strip_prefix = "chart",
-	package_dir = "minio-importer",
+	strip_prefix = "./chart",
 )
diff --git a/apps/rpuppy/BUILD b/apps/rpuppy/BUILD
index 8e8ee9d..b372086 100644
--- a/apps/rpuppy/BUILD
+++ b/apps/rpuppy/BUILD
@@ -31,6 +31,5 @@
 	name = "chart",
 	srcs = glob(["chart/**"]),
 	extension = "tar.gz",
-	strip_prefix = "chart",
-	package_dir = "rpuppy",
+	strip_prefix = "./chart",
 )