diff --git a/Dockerfile b/Dockerfile
index 3d7399c..1e16ad6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,9 @@ FROM ghcr.io/front-matter/invenio-rdm-starter:v12.0.18.0
 
 RUN /opt/invenio/.venv/bin/python -m ensurepip
 RUN /opt/invenio/.venv/bin/python -m pip install --upgrade pip
-RUN /opt/invenio/.venv/bin/python -m pip install invenio-theme-iform==2025.6.3
+RUN /opt/invenio/.venv/bin/python -m pip install invenio-theme-iform==2025.6.6.4
 RUN apt update -y && apt upgrade -y
 RUN apt install -y npm
 RUN invenio collect --verbose
 RUN invenio webpack buildall
 # RUN apt remove -y npm && apt autoremove -y
-RUN ls -la /opt/invenio/var/instance/static/ || echo "Static directory not found"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 2132e66..f001ecd 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -12,7 +12,6 @@ services:
         volumes:
             - caddy_data:/data
             - ./env/${COMPOSE_PROFILES}/caddy:/etc/caddy
-            - static_files:/var/www/static:ro
         restart: unless-stopped
         labels:
             - "io.containers.autoupdate=registry"
@@ -26,6 +25,7 @@ services:
             - archived_data:/opt/invenio/var/instance/archive
             - static_files:/opt/invenio/var/instance/static
             - ./invenio.cfg:/opt/invenio/var/instance/invenio.cfg
+            - ./dev_templates:/dev_templates
         environment:
             - INVENIO_THEME_LOGO
             - INVENIO_THEME_FRONTPAGE_TITLE
@@ -59,7 +59,6 @@ services:
             - INVENIO_MAIL_SUPPRESS_SEND
             - INVENIO_SECURITY_EMAIL_SENDER
             - INVENIO_ACCOUNTS_LOCAL_LOGIN_ENABLED
-            - INVENIO_OAUTHCLIENT_REMOTE_APPS
             - INVENIO_ORCID_APP_CREDENTIALS_CONSUMER_KEY=${INVENIO_ORCID_CLIENT_ID}
             - INVENIO_ORCID_APP_CREDENTIALS_CONSUMER_SECRET=${INVENIO_ORCID_SECRET}
             - INVENIO_GITHUB_APP_CREDENTIALS_CONSUMER_KEY=${INVENIO_GITHUB_CLIENT_ID}
@@ -73,7 +72,6 @@ services:
             - INVENIO_SEARCH_HOSTS
             - INVENIO_SEARCH_INDEX_PREFIX
             - INVENIO_LOGGING_CONSOLE_LEVEL
-            - INVENIO_APP_ALLOWED_HOSTS
             - INVENIO_ENV=${COMPOSE_PROFILES}
             - FLASK_ENV=${COMPOSE_PROFILES}
             - NODE_ENV=${COMPOSE_PROFILES}
@@ -175,17 +173,6 @@ services:
         ports:
             - "9200:9200"
             - "9600:9600"
-    oauth2-proxy:
-        image: quay.io/oauth2-proxy/oauth2-proxy:latest-alpine
-        profiles:
-            - development
-        ports:
-            - "4180:4180"
-        depends_on:
-            caddy:
-                condition: service_started
-        networks:
-            - invenio-network
 
 networks:
     invenio-network:
diff --git a/env/development/caddy/Caddyfile b/env/development/caddy/Caddyfile
index 562f78c..bc48e0f 100644
--- a/env/development/caddy/Caddyfile
+++ b/env/development/caddy/Caddyfile
@@ -3,11 +3,6 @@
 }
 
 localhost {
-    handle_path /static* {
-        root * /var/www/static
-        file_server
-    }
-
 	reverse_proxy invenio-rdm:5000 {
 		header_down Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0"
 		header_down Pragma "no-cache"
diff --git a/env/invenio.env b/env/invenio.env
index d0fe07a..88674fa 100644
--- a/env/invenio.env
+++ b/env/invenio.env
@@ -70,10 +70,6 @@ INVENIO_SEARCH_INDEX_PREFIX=invenio-rdm-
 # Logging
 INVENIO_LOGGING_CONSOLE_LEVEL=WARNING
 
-# OAuth Client Settings
-INVENIO_OAUTHCLIENT_AUTO_REDIRECT_TO_EXTERNAL_LOGIN=false
-INVENIO_ACCOUNTS_LOGIN_VIEW_FUNCTION=auto_redirect_login
-
 # Theme Configuration for I-Form
 INVENIO_THEME_IFORM_PRODUCTION=false
 INVENIO_THEME_IFORM_CONTACT_FORM=true
diff --git a/env/production/caddy/Caddyfile b/env/production/caddy/Caddyfile
index bea2d7d..1f8c574 100644
--- a/env/production/caddy/Caddyfile
+++ b/env/production/caddy/Caddyfile
@@ -3,11 +3,6 @@
 }
 
 invenio.i-form.ie {
-    handle_path /static/* {
-        root * /var/www/
-        file_server
-    }
-
 	reverse_proxy invenio-rdm:5000
 	encode gzip
 }
diff --git a/invenio.cfg b/invenio.cfg
index 7750c44..dca76d4 100644
--- a/invenio.cfg
+++ b/invenio.cfg
@@ -97,7 +97,7 @@ APP_THEME = ["invenio-theme-iform", "semantic-ui"]
 # provided, the allowed hosts variable is set to localhost. In production it
 # should be set to the correct host and it is strongly recommended to only
 # route correct hosts to the application.
-APP_ALLOWED_HOSTS = ["localhost", "127.0.0.1"]
+APP_ALLOWED_HOSTS = ["localhost", "localhost:8443", "localhost:5000" "127.0.0.1"]
 
 
 # Flask-SQLAlchemy
@@ -578,10 +578,10 @@ OAUTHCLIENT_REMOTE_APPS = {
 }
 
 # OAuth App Credentials (set via environment variables)
-# ORCID_APP_CREDENTIALS = {
-#     "consumer_key": "",  # Set via INVENIO_ORCID_APP_CREDENTIALS_CONSUMER_KEY
-#     "consumer_secret": "",  # Set via INVENIO_ORCID_APP_CREDENTIALS_CONSUMER_SECRET
-# }
+ORCID_APP_CREDENTIALS = {
+    "consumer_key": "",  # Set via INVENIO_ORCID_APP_CREDENTIALS_CONSUMER_KEY
+    "consumer_secret": "",  # Set via INVENIO_ORCID_APP_CREDENTIALS_CONSUMER_SECRET
+}
 
 # GITHUB_APP_CREDENTIALS = {
 #     "consumer_key": "CHANGE ME",
@@ -591,7 +591,8 @@ OAUTHCLIENT_REMOTE_APPS = {
 ACCOUNTS_LOGIN_VIEW_FUNCTION = (
     auto_redirect_login  # autoredirect to external login if enabled
 )
-OAUTHCLIENT_AUTO_REDIRECT_TO_EXTERNAL_LOGIN = False  # autoredirect to external login
+# autoredirect to external login
+OAUTHCLIENT_AUTO_REDIRECT_TO_EXTERNAL_LOGIN = False
 
 # Invenio-UserProfiles
 # --------------------