diff --git a/content-node/docker-compose/docker-compose.yml b/content-node/docker-compose/docker-compose.yml
index b566695..47cae22 100644
--- a/content-node/docker-compose/docker-compose.yml
+++ b/content-node/docker-compose/docker-compose.yml
@@ -1,66 +1,32 @@
 services:
-  nginx:
-    image: nginx:latest
+  caddy:
+    image: caddy:2.9
     ports:
       - "80:80"
       - "443:443"
     volumes:
-      - ./letsencrypt:/etc/letsencrypt
-      - ./webroot:/var/www/certbot
-      - ./nginx-entrypoint.sh:/docker-entrypoint.d/40-config-nginx.sh:ro
-    environment:
-      - SERVER_NAME=${SERVER_NAME}
-      - SETUP_SSL=${SETUP_SSL:-false}
-    labels:
-      - "com.centurylinklabs.watchtower.enable=true"
-    restart: unless-stopped
-
-  certbot:
-    image: certbot/certbot
-    volumes:
-      - ./letsencrypt:/etc/letsencrypt
-      - ./webroot:/var/www/certbot
-    entrypoint: sh
+      - caddy_data:/data
+      - caddy_config:/config
     command: >
-      -c '
-      if [ "$SETUP_SSL" != "true" ]; then
-        echo "SSL setup not enabled, skipping certbot"
-        exit 0
-      fi;
-      certbot certonly --webroot --webroot-path=/var/www/certbot 
-      --email ${CERTBOT_EMAIL} --agree-tos --no-eff-email 
-      --force-renewal -d ${SERVER_NAME}'
+      sh -c 'echo "{
+        admin off
+      }
+
+      http://localhost:80 {
+        reverse_proxy content-node:5000
+      }
+      http://${SERVER_NAME}, https://${SERVER_NAME} {
+        reverse_proxy content-node:5000
+      }" > /etc/caddy/Caddyfile && caddy run --config /etc/caddy/Caddyfile'
     environment:
-      - SETUP_SSL=${SETUP_SSL:-false}
-    depends_on:
-      - nginx
+      - SERVER_NAME
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
-
-  cert-handler:
-    image: docker:cli
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./letsencrypt:/etc/letsencrypt:ro
-    entrypoint: sh
-    command: >
-      -c '
-      if [ "$SETUP_SSL" != "true" ]; then
-        echo "SSL setup not enabled, skipping cert handler"
-        exit 0
-      fi;
-      while ! test -f /etc/letsencrypt/live/${SERVER_NAME}/fullchain.pem; do
-        sleep 1;
-      done;
-      sleep 1;
-      NGINX_CONTAINER=$$(docker ps -q -f name=nginx); docker restart $$NGINX_CONTAINER;
-      echo "Nginx restarted successfully"'
-    environment:
-      - SETUP_SSL=${SETUP_SSL:-false}
-      - SERVER_NAME=${SERVER_NAME}
+    restart: unless-stopped
     depends_on:
-      certbot:
-        condition: service_completed_successfully
+      - content-node
+    networks:
+      - content_network
 
   content-node:
     image: earthfast/content-node:09347bad740a7881915b31143458482abb1cb75b
@@ -77,6 +43,8 @@ services:
     restart: unless-stopped
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
+    networks:
+      - content_network
 
   watchtower:
     profiles:
@@ -90,6 +58,13 @@ services:
       - WATCHTOWER_POLL_INTERVAL=60
     command: --interval 60 --cleanup --include-restarting
     restart: unless-stopped
+    networks:
+      - content_network
+
+networks:
+  content_network:
+    driver: bridge
 
 volumes:
-  letsencrypt:
+  caddy_data:
+  caddy_config:
diff --git a/content-node/docker-compose/nginx-entrypoint.sh b/content-node/docker-compose/nginx-entrypoint.sh
deleted file mode 100755
index dfbfe65..0000000
--- a/content-node/docker-compose/nginx-entrypoint.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-set -e
-
-# Validate SERVER_NAME
-if [ -z "$SERVER_NAME" ]; then
-    echo "Error: SERVER_NAME environment variable is required"
-    exit 1
-fi
-
-# Clean server name
-CLEAN_NAME=$(echo "$SERVER_NAME" | sed 's/\/\+$//')
-echo "Using server name: $CLEAN_NAME"
-
-# Create nginx config
-cat >/etc/nginx/conf.d/default.conf <<EOF
-server_names_hash_bucket_size 128;
-
-server {
-    listen 80;
-    listen [::]:80;
-    server_name $CLEAN_NAME;
-    
-    location /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-    }
-
-    location / {
-        proxy_pass http://content-node:5000;
-        proxy_set_header X-Forwarded-For \$remote_addr;
-        proxy_set_header Host \$http_host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header X-Forwarded-Proto \$scheme;
-    }
-}
-EOF
-
-if [ "$SETUP_SSL" = "true" ] && [ -f "/etc/letsencrypt/live/$CLEAN_NAME/fullchain.pem" ]; then
-    cat >>/etc/nginx/conf.d/default.conf <<EOF
-
-server {
-    listen 443 ssl;
-    listen [::]:443 ssl;
-    server_name $CLEAN_NAME;
-
-    ssl_certificate /etc/letsencrypt/live/$CLEAN_NAME/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/$CLEAN_NAME/privkey.pem;
-
-    location / {
-        proxy_pass http://content-node:5000;
-        proxy_set_header X-Forwarded-For \$remote_addr;
-        proxy_set_header Host \$http_host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header X-Forwarded-Proto \$scheme;
-    }
-}
-EOF
-fi
-
-echo "Generated nginx configuration:"
-cat /etc/nginx/conf.d/default.conf
diff --git a/content-node/docker-compose/setup.sh b/content-node/docker-compose/setup.sh
index de3c9b4..9d8905d 100755
--- a/content-node/docker-compose/setup.sh
+++ b/content-node/docker-compose/setup.sh
@@ -100,7 +100,7 @@ AUTO_UPGRADE="false"
 
 while [[ "$#" -gt 0 ]]; do
     case $1 in
-    --help|-h) usage ;;
+    --help | -h) usage ;;
     --staging) ENVIRONMENT="staging" ;;
     --auto-upgrade) AUTO_UPGRADE="true" ;;
     *)
@@ -141,46 +141,16 @@ fi
 CONTRACT_ADDRESS=$([ "$ENVIRONMENT" = "staging" ] && echo "0x69e4aa095489E8613B4C4d396DD916e66D66aE23" || echo "0xb1c5F9914648403cb32a4f83B0fb946E5f7702CC")
 log_info "Using contract address: $CONTRACT_ADDRESS"
 
-# Validation functions
-validate_input() {
-    local type=$1
-    local value=$2
-    case $type in
-    domain) [[ $value =~ ^[a-zA-Z0-9][a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ ]] ;;
-    node_id) [[ $value =~ ^0x[a-fA-F0-9]{64}$ ]] ;;
-    email) [[ $value =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ ]] ;;
-    boolean) [[ $value =~ ^(true|false)$ ]] ;;
-    esac
-}
-
-# Get and validate inputs with a generic function
-get_validated_input() {
-    local prompt=$1
-    local type=$2
-    local value
-    while true; do
-        printf "${BLUE}%s${NC}: " "$prompt"
-        read -r value || return 1
-        value=$(echo "$value" | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]')
-        if validate_input "$type" "$value"; then
-            echo "$value"
-            break
-        else
-            log_error "Invalid input format. Please try again."
-        fi
-    done
-}
-
 # Check if .env file exists and handle setup process
 if [ -f ".env" ]; then
     log_info "Current .env file contents:"
     echo "----------------------------------------"
     cat .env
     echo "----------------------------------------"
-    
+
     log_warning "An .env file already exists!"
     read -p "Would you like to go through the .env setup process again? (y/n): " setup_again
-    
+
     if [[ ! $setup_again =~ ^[Yy]$ ]]; then
         log_info "Keeping existing .env file."
         echo
@@ -195,7 +165,7 @@ if [ -f ".env" ]; then
         fi
         exit 0
     fi
-    
+
     # Backup existing .env file
     backup_file=".env.backup.$(date +%Y%m%d_%H%M%S)"
     mv .env "$backup_file"
@@ -206,7 +176,6 @@ fi
 log_info "Please provide the following information:"
 printf "\n"
 
-# Get inputs - with explicit prompts
 printf "${BLUE}Enter your server name (e.g., content-1.us-east-1.sepolia.earthfastnodes.com)${NC}: "
 read -r SERVER_NAME
 SERVER_NAME=$(echo "$SERVER_NAME" | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]')
@@ -215,20 +184,21 @@ printf "${BLUE}Enter your node ID (e.g., 0xb10e2d52...)${NC}: "
 read -r NODE_ID
 NODE_ID=$(echo "$NODE_ID" | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]')
 
-printf "${BLUE}Do you want to set up SSL? (true/false)${NC}: "
-read -r SETUP_SSL
-SETUP_SSL=$(echo "$SETUP_SSL" | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]')
-
-printf "${BLUE}Enter your certbot email${NC}: "
+printf "${BLUE}Enter your email for SSL certificates${NC}: "
 read -r CERTBOT_EMAIL
 CERTBOT_EMAIL=$(echo "$CERTBOT_EMAIL" | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]')
 
-check_ports_and_ip() {
+# Verify FQDN points to correct IP
+log_info "Verifying FQDN..."
+if ! verify_fqdn "$SERVER_NAME"; then
+    log_error "FQDN verification failed. Exiting..."
+    exit 1
+fi
+
+# Check ports
+check_ports() {
     local ports=("80" "443")
-    local ip=$(curl -s ifconfig.me)
     local success=true
-
-    # Check if ports are open
     for port in "${ports[@]}"; do
         if netstat -tuln | grep -q ":$port "; then
             log_error "Port $port is already in use"
@@ -238,39 +208,19 @@ check_ports_and_ip() {
         fi
     done
 
-    # Check if ports are accessible from outside
-    # log_info "Checking port accessibility from external service..."
-    # for port in "${ports[@]}"; do
-    #     if curl -s "https://ports.yougetsignal.com/check-port.php" \
-    #         -H "User-Agent: Mozilla/5.0" \
-    #         --data-raw "remoteAddress=${ip}&portNumber=${port}" \
-    #         | grep -q "open"; then
-    #         log_success "Port $port is accessible from outside"
-    #     else
-    #         log_warning "Port $port might be blocked by firewall"
-    #         success=false
-    #     fi
-    # done
+    # TODO: Check if ports are accessible from outside
 
     return $([[ "$success" == "true" ]] && echo 0 || echo 1)
 }
 
-if [ "$SETUP_SSL" = "true" ]; then
-    log_info "Verifying FQDN..."
-    if ! verify_fqdn "$SERVER_NAME"; then
-        log_error "FQDN verification failed. Exiting..."
+log_info "Checking ports..."
+if ! check_ports; then
+    log_error "Port check failed. Please ensure ports 80 and 443 are open and available."
+    read -p "Continue anyway? (y/n): " continue
+    if [[ ! $continue =~ ^[Yy]$ ]]; then
+        log_error "Setup cancelled due to port verification failure."
         exit 1
     fi
-
-    log_info "Checking ports for SSL..."
-    if ! check_ports_and_ip; then
-        log_error "Port check failed. Please ensure ports 80 and 443 are open and available."
-        read -p "Continue anyway? (y/n): " continue
-        if [[ ! $continue =~ ^[Yy]$ ]]; then
-            log_error "Setup cancelled due to port verification failure."
-            exit 1
-        fi
-    fi
 fi
 
 # Create .env file
@@ -278,7 +228,6 @@ log_info "Creating .env file..."
 cat >.env <<EOF
 SERVER_NAME=$SERVER_NAME
 NODE_ID=$NODE_ID
-SETUP_SSL=$SETUP_SSL
 CERTBOT_EMAIL=$CERTBOT_EMAIL
 RPC_URL=https://eth-sepolia.g.alchemy.com/v2/7xFp9qkRZTVC7CvUHODk7TgyemLtkzxt
 CONTRACT_ADDRESS=$CONTRACT_ADDRESS