diff --git a/charts-wip/matrix-synapse/.helmignore b/charts/matrix-synapse/.helmignore
similarity index 100%
rename from charts-wip/matrix-synapse/.helmignore
rename to charts/matrix-synapse/.helmignore
diff --git a/charts-wip/matrix-synapse/Chart.lock b/charts/matrix-synapse/Chart.lock
similarity index 100%
rename from charts-wip/matrix-synapse/Chart.lock
rename to charts/matrix-synapse/Chart.lock
diff --git a/charts-wip/matrix-synapse/Chart.yaml b/charts/matrix-synapse/Chart.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/Chart.yaml
rename to charts/matrix-synapse/Chart.yaml
diff --git a/charts-wip/matrix-synapse/README.md b/charts/matrix-synapse/README.md
similarity index 100%
rename from charts-wip/matrix-synapse/README.md
rename to charts/matrix-synapse/README.md
diff --git a/charts-wip/matrix-synapse/charts/postgresql-8.9.9.tgz b/charts/matrix-synapse/charts/postgresql-8.9.9.tgz
similarity index 100%
rename from charts-wip/matrix-synapse/charts/postgresql-8.9.9.tgz
rename to charts/matrix-synapse/charts/postgresql-8.9.9.tgz
diff --git a/charts-wip/matrix-synapse/charts/redis-10.6.19.tgz b/charts/matrix-synapse/charts/redis-10.6.19.tgz
similarity index 100%
rename from charts-wip/matrix-synapse/charts/redis-10.6.19.tgz
rename to charts/matrix-synapse/charts/redis-10.6.19.tgz
diff --git a/charts-wip/matrix-synapse/templates/NOTES.txt b/charts/matrix-synapse/templates/NOTES.txt
similarity index 100%
rename from charts-wip/matrix-synapse/templates/NOTES.txt
rename to charts/matrix-synapse/templates/NOTES.txt
diff --git a/charts-wip/matrix-synapse/templates/_helpers.tpl b/charts/matrix-synapse/templates/_helpers.tpl
similarity index 100%
rename from charts-wip/matrix-synapse/templates/_helpers.tpl
rename to charts/matrix-synapse/templates/_helpers.tpl
diff --git a/charts-wip/matrix-synapse/templates/configuration.yaml b/charts/matrix-synapse/templates/configuration.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/configuration.yaml
rename to charts/matrix-synapse/templates/configuration.yaml
diff --git a/charts-wip/matrix-synapse/templates/deployment.yaml b/charts/matrix-synapse/templates/deployment.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/deployment.yaml
rename to charts/matrix-synapse/templates/deployment.yaml
diff --git a/charts-wip/matrix-synapse/templates/ingress.yaml b/charts/matrix-synapse/templates/ingress.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/ingress.yaml
rename to charts/matrix-synapse/templates/ingress.yaml
diff --git a/charts-wip/matrix-synapse/templates/pvc.yaml b/charts/matrix-synapse/templates/pvc.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/pvc.yaml
rename to charts/matrix-synapse/templates/pvc.yaml
diff --git a/charts-wip/matrix-synapse/templates/secrets.yaml b/charts/matrix-synapse/templates/secrets.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/secrets.yaml
rename to charts/matrix-synapse/templates/secrets.yaml
diff --git a/charts-wip/matrix-synapse/templates/service.yaml b/charts/matrix-synapse/templates/service.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/service.yaml
rename to charts/matrix-synapse/templates/service.yaml
diff --git a/charts-wip/matrix-synapse/templates/signing-key-job.yaml b/charts/matrix-synapse/templates/signing-key-job.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/signing-key-job.yaml
rename to charts/matrix-synapse/templates/signing-key-job.yaml
diff --git a/charts-wip/matrix-synapse/templates/tests/test-connection.yaml b/charts/matrix-synapse/templates/tests/test-connection.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/tests/test-connection.yaml
rename to charts/matrix-synapse/templates/tests/test-connection.yaml
diff --git a/charts-wip/matrix-synapse/templates/well-known.yaml b/charts/matrix-synapse/templates/well-known.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/well-known.yaml
rename to charts/matrix-synapse/templates/well-known.yaml
diff --git a/charts-wip/matrix-synapse/templates/worker-configuration.yaml b/charts/matrix-synapse/templates/worker-configuration.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/worker-configuration.yaml
rename to charts/matrix-synapse/templates/worker-configuration.yaml
diff --git a/charts-wip/matrix-synapse/templates/worker-deployment.yaml b/charts/matrix-synapse/templates/worker-deployment.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/templates/worker-deployment.yaml
rename to charts/matrix-synapse/templates/worker-deployment.yaml
diff --git a/charts-wip/matrix-synapse/values.yaml b/charts/matrix-synapse/values.yaml
similarity index 100%
rename from charts-wip/matrix-synapse/values.yaml
rename to charts/matrix-synapse/values.yaml