diff --git a/hosts/containers/public-access-proxy/configuration.nix b/hosts/containers/public-access-proxy/configuration.nix
index 770350df..ccb1e9a8 100644
--- a/hosts/containers/public-access-proxy/configuration.nix
+++ b/hosts/containers/public-access-proxy/configuration.nix
@@ -6,31 +6,13 @@
 
 {
   imports =
-    [ <nixpkgs/nixos/modules/profiles/minimal.nix>
+    [ ../../../lib/lxc-container.nix
+      ../../../lib/shared.nix
+      ../../../lib/admins.nix
       ./proxy.nix
     ];
-  nix.useSandbox = false;
-  nix.maxJobs = lib.mkDefault 2;
-  nix.buildCores = lib.mkDefault 16;
-
-  boot.isContainer = true;
-  # /sbin/init
-  boot.loader.initScript.enable = true;
-  boot.loader.grub.enable = false;
-
-  fileSystems."/" = { fsType = "rootfs"; device = "rootfs"; };
 
   networking.hostName = "public-access-proxy";
-  networking.defaultGateway = { address = "172.22.99.4"; interface = "eth0"; };
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  services.openssh = {
-    enable = true;
-    permitRootLogin = "yes";
-    ports = [ 1122 ];
-  };
 
   my.services.proxy = {
     enable = true;
diff --git a/hosts/containers/public-access-proxy/proxy.nix b/hosts/containers/public-access-proxy/proxy.nix
index fad4795d..239ca4fd 100644
--- a/hosts/containers/public-access-proxy/proxy.nix
+++ b/hosts/containers/public-access-proxy/proxy.nix
@@ -82,12 +82,12 @@ in {
 
         frontend http-in
           bind :::80 v4v6
+          timeout client 30000
           default_backend proxy-backend-http
   
         backend proxy-backend-http
           timeout connect 5000
           timeout check 5000
-          timeout client 30000
           timeout server 30000
           ${concatMapStringsSep "\n" (proxyHost:
             optionalString (proxyHost.hostNames != [] && proxyHost.proxyTo.host != null) (
@@ -102,12 +102,12 @@ in {
 
         frontend https-in
           bind :::443 v4v6
+          timeout client 30000
           default_backend proxy-backend-https
 
         backend proxy-backend-https
           timeout connect 5000
           timeout check 5000
-          timeout client 30000
           timeout server 30000
           ${concatMapStringsSep "\n" (proxyHost:
             optionalString (proxyHost.hostNames != [] && proxyHost.proxyTo.host != null) (
diff --git a/hq.nixops b/hq.nixops
index 70ea5265..549006b6 100644
--- a/hq.nixops
+++ b/hq.nixops
@@ -48,4 +48,17 @@
 				storeKeysOnMachine = true;
 			};
 		};
+
+	"public-access-proxy" =
+		{ ... }:
+		{
+			imports = [
+				hosts/containers/public-access-proxy/configuration.nix
+			];
+			deployment = {
+				targetHost = "2a02:8106:208:5201:1024:5fff:febd:9be7";
+				storeKeysOnMachine = true;
+			};
+		};
+
 }