diff --git a/common/services/main.tf b/common/services/main.tf
index 370988c..c50e082 100644
--- a/common/services/main.tf
+++ b/common/services/main.tf
@@ -41,49 +41,18 @@ data "cloudinit_config" "this" {
 
   part {
     content_type = "text/x-shellscript"
-    content      = <<-EOT
-      #!/bin/bash
-
-      sudo yum update -y
-      sudo yum install -y nginx
-
-      # Create nginx config
-      sudo tee /etc/nginx/nginx.conf <<'EOF'
-      events {
-          worker_connections 1024;
+    content = templatefile("${path.module}/nginx_proxy.tpl", {
+      services_map = {
+        "flagracer.carlssonk.com" = "flagracer.carlssonk:8080", # TODO
+        "blackjack.carlssonk.com" = "blackjack.carlssonk:8080", # TODO
       }
-
-      http {
-          map $http_host $upstream {
-              hostnames;
-              blackjack.carlssonk.com blackjack.carlssonk:8080;
-              flagracer.carlssonk.com flagracer.carlssonk:8080;
-          }
-          
-          server {
-              listen 80;
-              server_name blackjack.carlssonk.com flagracer.carlssonk.com;
-
-              resolver 10.0.0.2;
-
-              location / {
-                  proxy_pass $upstream;
-                  proxy_set_header Host $host;
-                  proxy_set_header X-Real-IP $remote_addr;
-                  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                  proxy_set_header X-Forwarded-Proto $scheme;
-              }
-          }
-      }
-      EOF
-
-      # Restart NGINX to apply changes
-      sudo systemctl restart nginx
-      EOT
+      dns_resolver_ip = "10.0.0.2"
+      server_name     = "blackjack.carlssonk.com flagracer.carlssonk.com"
+    })
   }
 }
 
-module "ec2_instance_nginx" {
+module "ec2_instance_nginx_proxy" {
   count             = var.reverse_proxy_type == "nginx" ? 1 : 0
   name              = "nginx-reverse-proxy"
   source            = "../../modules/ec2-instance/default"
@@ -120,7 +89,7 @@ module "ec2_instance_nginx" {
 module "ec2_instance_nginx_eip" {
   count       = var.reverse_proxy_type == "nginx" ? 1 : 0
   source      = "../../modules/elastic-ip/default"
-  instance_id = module.ec2_instance_nginx[0].id
+  instance_id = module.ec2_instance_nginx_proxy[0].id
 }
 
 module "main_alb_access_logs_bucket" {
diff --git a/common/services/nginx_proxy.tpl b/common/services/nginx_proxy.tpl
new file mode 100644
index 0000000..40171f9
--- /dev/null
+++ b/common/services/nginx_proxy.tpl
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+sudo yum update -y
+sudo yum install -y nginx
+
+# Create nginx config
+sudo tee /etc/nginx/nginx.conf <<'EOF'
+events {
+    worker_connections 1024;
+}
+
+http {
+    map $http_host $upstream {
+        hostnames;
+        %{ for domain, backend in services_map ~}
+        ${domain} ${backend};
+        %{ endfor ~}
+    }
+    
+    server {
+        listen 80;
+        server_name ${server_name};
+
+        resolver ${dns_resolver_ip};
+
+        location / {
+            proxy_pass $upstream;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
+    }
+}
+EOF
+
+# Restart NGINX to apply changes
+sudo systemctl restart nginx
\ No newline at end of file
diff --git a/common/services/nginx_reverse_proxy.tpl b/common/services/nginx_reverse_proxy.tpl
deleted file mode 100644
index 317fecc..0000000
--- a/common/services/nginx_reverse_proxy.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-
-#!/bin/bash
-
-sudo yum update -y
-sudo yum install -y nginx certbot python3-certbot-nginx
-
-# Create nginx config
-sudo tee /etc/nginx/nginx.conf <<EOF
-events {
-    worker_connections 1024;
-}
-
-http {
-
-    map $http_host $upstream {
-        hostnames;
-        %{ for domain, backend in services_map ~}
-        ${domain} ${backend};
-        %{ endfor ~}
-        default default_backend;
-    }
-
-    server {
-        listen 80;
-        server_name _;
-        return 301 https://$host$request_uri;
-    }
-
-    server {
-        listen 443 ssl;
-        server_name _;
-
-        %{ for domain in root_domains ~}
-        ssl_certificate /etc/letsencrypt/live/${domain}/fullchain.pem;
-        ssl_certificate_key /etc/letsencrypt/live/${domain}/privkey.pem;
-        %{ endfor ~}
-
-        # Improve SSL settings
-        ssl_protocols TLSv1.2 TLSv1.3;
-        ssl_prefer_server_ciphers on;
-        ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
-
-        location / {
-            proxy_pass http://$upstream;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-        }
-    }
-}
-EOF
-
-# Obtain SSL certificate
-sudo certbot --nginx -d ${certbot_domains} --non-interactive --agree-tos -m oliver@carlssonk.com
-
-# Ensure Certbot auto-renewal is enabled
-sudo systemctl enable certbot.timer
-sudo systemctl start certbot.timer
-
-# Restart NGINX to apply changes
-sudo systemctl restart nginx
\ No newline at end of file
diff --git a/common/services/outputs.tf b/common/services/outputs.tf
index 48e2bf8..3bac172 100644
--- a/common/services/outputs.tf
+++ b/common/services/outputs.tf
@@ -1,7 +1,7 @@
 output "policy_documents" {
   value = [
     try(module.service_discovery_namespace[0].policy_document, null),
-    try(module.ec2_instance_nginx[0].policy_document, null),
+    try(module.ec2_instance_nginx_proxy[0].policy_document, null),
     try(module.ec2_instance_nginx_eip[0].policy_document, null),
     try(module.main_alb[0].policy_document, null),
     try(module.main_alb_access_logs_bucket[0].policy_document, null),