diff --git a/config-tasks/paulgo.yaml b/config-tasks/searxng.yaml
similarity index 58%
rename from config-tasks/paulgo.yaml
rename to config-tasks/searxng.yaml
index 927cb0b..98e3214 100644
--- a/config-tasks/paulgo.yaml
+++ b/config-tasks/searxng.yaml
@@ -1,29 +1,29 @@
     - name: Generate JWT Secret
       command: openssl rand -hex 32
-      register: paulgo_jwt_secret_result
+      register: searxng_jwt_secret_result
 
     - set_fact:
-        paulgo_jwt_secret: "{{ paulgo_jwt_secret_result.stdout }}"
+        searxng_jwt_secret: "{{ searxng_jwt_secret_result.stdout }}"
 
-    - name: Set up paulgo conf
+    - name: Set up settings.yml
       template:
         src: "conf/settings.yml.j2"
-        dest: "{{ docker_dir }}/paulgo/settings.yml"
+        dest: "{{ docker_dir }}/searxng/settings.yml"
         owner: 1000
         group: 1000
         mode: 0755
 
     - name: Copy donate.md
       copy:
-        src: "paulgo/donate.md"
-        dest: "{{ docker_dir }}/paulgo/donate.md"
+        src: "searxng/donate.md"
+        dest: "{{ docker_dir }}/searxng/donate.md"
         owner: 1000
         group: 1000
         mode: 0755
 
     - name: Create valkey-data directory
       ansible.builtin.file:
-        path: "{{ docker_dir }}/paulgo/valkey-data"
+        path: "{{ docker_dir }}/searxng/valkey-data"
         state: directory
         owner: 999
         group: 1000
diff --git a/files/paulgo/donate.md b/files/searxng/donate.md
similarity index 100%
rename from files/paulgo/donate.md
rename to files/searxng/donate.md
diff --git a/templates/compose/paulgo.yaml.j2 b/templates/compose/searxng.yaml.j2
similarity index 67%
rename from templates/compose/paulgo.yaml.j2
rename to templates/compose/searxng.yaml.j2
index a02284f..1fc46da 100644
--- a/templates/compose/paulgo.yaml.j2
+++ b/templates/compose/searxng.yaml.j2
@@ -24,22 +24,14 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Asia/Singapore
-      - LIMITER=true
-      - REDIS_URL=redis://localhost:6379/0
-      - IMAGE_PROXY=true
-      - BASE_URL=https://opnxng.com/
-      - NAME=SearXNG
-      - CONTACT=https://about.opnxng.com/
-      - ISSUE_URL=https://github.com/searxng/searxng/issues
-      - GIT_URL=https://github.com/paulgoio/searxng
-      - GIT_BRANCH=main
+      - SEARXNG_BASE_URL=https://${SEARXNG_HOSTNAME:-localhost}
       - UWSGI_WORKERS=1
       - UWSGI_THREADS=16
     depends_on:
       - searxng-redis
     volumes:
-      - {{ docker_dir }}/paulgo/settings.yml:/usr/local/searxng/searx/settings.yml
-      - {{ docker_dir }}/paulgo/donate.md:/usr/local/searxng/searx/infopage/en/donate.md
+      - {{ docker_dir }}/searxng/settings.yml:/usr/local/searxng/searx/settings.yml
+      - {{ docker_dir }}/searxng/donate.md:/usr/local/searxng/searx/infopage/en/donate.md
     network_mode: host
 
   searxng-redis:
@@ -54,7 +46,7 @@ services:
       #- PGID=1000
       - TZ=Asia/Singapore
     volumes:
-      - {{ docker_dir }}/paulgo/valkey-data:/data
+      - {{ docker_dir }}/searxng/valkey-data:/data
     cap_drop:
       - ALL
     cap_add:
diff --git a/templates/conf/settings.yml.j2 b/templates/conf/settings.yml.j2
index 21790eb..583c1ca 100755
--- a/templates/conf/settings.yml.j2
+++ b/templates/conf/settings.yml.j2
@@ -86,7 +86,7 @@ server:
 
   # If your instance owns a /etc/searxng/settings.yml file, then set the following
   # values there.
-  secret_key: "{{ paulgo_jwt_secret }}"  # Is overwritten by ${SEARXNG_SECRET}
+  secret_key: "{{ searxng_jwt_secret }}"  # Is overwritten by ${SEARXNG_SECRET}
   # Proxying image results through searx
   image_proxy: true
   # 1.0 and 1.1 are supported
diff --git a/vars/services.yaml b/vars/services.yaml
index 64b37a0..085a32d 100644
--- a/vars/services.yaml
+++ b/vars/services.yaml
@@ -1,10 +1,22 @@
-config:
-  oracle3:
-    - gitea
-
 compose:
+  oracle1:
+    - searxng
+  oracle2:
+    - searxng
   oracle3:
-    - gitea
+    - searxng
+  oracle4:
+    - searxng
+
+config:
+  oracle1:
+    - searxng
+  oracle2:
+    - searxng
+  oracle3:
+    - searxng
+  oracle4:
+    - searxng
 
 # ----------------------------------------------------------------------------------------------------
 
@@ -21,7 +33,7 @@ deployed-compose:
     - send
     - privatebin
     ####################
-    - paulgo
+    - searxng
     - redlib
     - voyager
     - mlmym
@@ -45,7 +57,7 @@ deployed-compose:
     - firefox
     - wolfree
     ####################
-    - paulgo
+    - searxng
     - redlib
     - voyager
     - mlmym
@@ -72,7 +84,7 @@ deployed-compose:
     - ntfy
     - breezewiki
     ####################
-    - paulgo
+    - searxng
     - redlib
     - voyager
     - mlmym
@@ -97,7 +109,7 @@ deployed-compose:
     - authelia
     - geoipupdate
     ####################
-    - paulgo
+    - searxng
     - redlib
     - voyager
     - mlmym
@@ -128,13 +140,13 @@ deployed-config:
     - anonymousoverflow
     - scribe
     - priviblur
-    - paulgo
+    - searxng
   oracle2:
     - firefox
     - anonymousoverflow
     - scribe
     - priviblur
-    - paulgo
+    - searxng
   oracle3:
     - ntfy
     - gitea
@@ -144,11 +156,11 @@ deployed-config:
     - scribe
     - priviblur
     - breezewiki
-    - paulgo
+    - searxng
   oracle4:
     - authelia
     - nitter
-    - paulgo
+    - searxng
     - caddy
     - anonymousoverflow
     - scribe