diff --git a/.gitignore b/.gitignore
index 521af85..c45543a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,8 +28,8 @@ Thumbs.db
 *~
 
 # Helm
-*.tgz
-charts/*.tgz
+# *.tgz  # Commented to allow subchart archives for ArgoCD
+# charts/*.tgz
 
 # Environment
 .env
diff --git a/helm/hades/Chart.lock b/hades/Chart.lock
similarity index 100%
rename from helm/hades/Chart.lock
rename to hades/Chart.lock
diff --git a/helm/hades/Chart.yaml b/hades/Chart.yaml
similarity index 100%
rename from helm/hades/Chart.yaml
rename to hades/Chart.yaml
diff --git a/hades/charts/mysql-1.6.9.tgz b/hades/charts/mysql-1.6.9.tgz
new file mode 100644
index 0000000..d23e4bc
Binary files /dev/null and b/hades/charts/mysql-1.6.9.tgz differ
diff --git a/helm/hades/sql/000_create_db.sql b/hades/sql/000_create_db.sql
similarity index 100%
rename from helm/hades/sql/000_create_db.sql
rename to hades/sql/000_create_db.sql
diff --git a/helm/hades/sql/001_init.sql b/hades/sql/001_init.sql
similarity index 100%
rename from helm/hades/sql/001_init.sql
rename to hades/sql/001_init.sql
diff --git a/helm/hades/sql/002_dump.sql b/hades/sql/002_dump.sql
similarity index 100%
rename from helm/hades/sql/002_dump.sql
rename to hades/sql/002_dump.sql
diff --git a/helm/hades/sql/002_dump.sql.bak2 b/hades/sql/002_dump.sql.bak2
similarity index 100%
rename from helm/hades/sql/002_dump.sql.bak2
rename to hades/sql/002_dump.sql.bak2
diff --git a/helm/hades/sql/003_data.sql b/hades/sql/003_data.sql
similarity index 100%
rename from helm/hades/sql/003_data.sql
rename to hades/sql/003_data.sql
diff --git a/helm/hades/sql/004_hades.sql b/hades/sql/004_hades.sql
similarity index 100%
rename from helm/hades/sql/004_hades.sql
rename to hades/sql/004_hades.sql
diff --git a/helm/hades/templates/_helpers.tpl b/hades/templates/_helpers.tpl
similarity index 100%
rename from helm/hades/templates/_helpers.tpl
rename to hades/templates/_helpers.tpl
diff --git a/helm/hades/templates/configmap-sql-migrations.yaml b/hades/templates/configmap-sql-migrations.yaml
similarity index 100%
rename from helm/hades/templates/configmap-sql-migrations.yaml
rename to hades/templates/configmap-sql-migrations.yaml
diff --git a/helm/hades/templates/configmap.yaml b/hades/templates/configmap.yaml
similarity index 100%
rename from helm/hades/templates/configmap.yaml
rename to hades/templates/configmap.yaml
diff --git a/helm/hades/templates/deployment.yaml b/hades/templates/deployment.yaml
similarity index 100%
rename from helm/hades/templates/deployment.yaml
rename to hades/templates/deployment.yaml
diff --git a/helm/hades/templates/job-dbinit.yaml b/hades/templates/job-dbinit.yaml
similarity index 100%
rename from helm/hades/templates/job-dbinit.yaml
rename to hades/templates/job-dbinit.yaml
diff --git a/helm/hades/templates/secret-db.yaml b/hades/templates/secret-db.yaml
similarity index 100%
rename from helm/hades/templates/secret-db.yaml
rename to hades/templates/secret-db.yaml
diff --git a/helm/hades/templates/service.yaml b/hades/templates/service.yaml
similarity index 100%
rename from helm/hades/templates/service.yaml
rename to hades/templates/service.yaml
diff --git a/helm/hades/templates/serviceaccount.yaml b/hades/templates/serviceaccount.yaml
similarity index 100%
rename from helm/hades/templates/serviceaccount.yaml
rename to hades/templates/serviceaccount.yaml
diff --git a/helm/hades/values-dev.yaml b/hades/values-dev.yaml
similarity index 100%
rename from helm/hades/values-dev.yaml
rename to hades/values-dev.yaml
diff --git a/helm/hades/values-local.yaml b/hades/values-local.yaml
similarity index 100%
rename from helm/hades/values-local.yaml
rename to hades/values-local.yaml
diff --git a/helm/hades/values.yaml b/hades/values.yaml
similarity index 100%
rename from helm/hades/values.yaml
rename to hades/values.yaml