diff --git a/hosts/storage-ng/dhcp/configuration.nix b/hosts/containers/dhcp/configuration.nix
similarity index 100%
rename from hosts/storage-ng/dhcp/configuration.nix
rename to hosts/containers/dhcp/configuration.nix
diff --git a/hosts/storage-ng/feile/configuration.nix b/hosts/containers/feile/configuration.nix
similarity index 100%
rename from hosts/storage-ng/feile/configuration.nix
rename to hosts/containers/feile/configuration.nix
diff --git a/hosts/storage-ng/feile/www/index.html b/hosts/containers/feile/www/index.html
similarity index 100%
rename from hosts/storage-ng/feile/www/index.html
rename to hosts/containers/feile/www/index.html
diff --git a/hosts/storage-ng/grafana/configuration.nix b/hosts/containers/grafana/configuration.nix
similarity index 100%
rename from hosts/storage-ng/grafana/configuration.nix
rename to hosts/containers/grafana/configuration.nix
diff --git a/hosts/storage-ng/lxc-template.nix b/hosts/containers/lxc-template.nix
similarity index 100%
rename from hosts/storage-ng/lxc-template.nix
rename to hosts/containers/lxc-template.nix
diff --git a/hosts/storage-ng/lxc-template.sh b/hosts/containers/lxc-template.sh
similarity index 100%
rename from hosts/storage-ng/lxc-template.sh
rename to hosts/containers/lxc-template.sh
diff --git a/hosts/storage-ng/mucbot/configuration.nix b/hosts/containers/mucbot/configuration.nix
similarity index 100%
rename from hosts/storage-ng/mucbot/configuration.nix
rename to hosts/containers/mucbot/configuration.nix
diff --git a/hosts/storage-ng/public-access-proxy/configuration.nix b/hosts/containers/public-access-proxy/configuration.nix
similarity index 100%
rename from hosts/storage-ng/public-access-proxy/configuration.nix
rename to hosts/containers/public-access-proxy/configuration.nix
diff --git a/hosts/storage-ng/public-access-proxy/proxy.nix b/hosts/containers/public-access-proxy/proxy.nix
similarity index 100%
rename from hosts/storage-ng/public-access-proxy/proxy.nix
rename to hosts/containers/public-access-proxy/proxy.nix
diff --git a/hosts/storage-ng/registry/configuration.nix b/hosts/containers/registry/configuration.nix
similarity index 100%
rename from hosts/storage-ng/registry/configuration.nix
rename to hosts/containers/registry/configuration.nix
diff --git a/hq.nixops b/hq.nixops
index 8b1dc0b2..746715b8 100644
--- a/hq.nixops
+++ b/hq.nixops
@@ -5,7 +5,7 @@
     { ... }:
     {
       imports = [
-        hosts/storage-ng/grafana/configuration.nix
+        hosts/containers/grafana/configuration.nix
       ];
       deployment = {
         targetHost = "grafana.hq.c3d2.de";
@@ -17,7 +17,7 @@
     { ... }:
     {
       imports = [
-        hosts/storage-ng/dhcp/configuration.nix
+        hosts/containers/dhcp/configuration.nix
       ];
       deployment = {
         targetHost = "2a02:8106:208:5201:3801:15ff:fe95:8988";
@@ -29,7 +29,7 @@
     { ... }:
     {
       imports = [
-        hosts/storage-ng/mucbot/configuration.nix
+        hosts/containers/mucbot/configuration.nix
       ];
       deployment = {
         targetHost = "2a02:8106:208:5201:28db:dff:fe6b:e89a";