diff --git a/README.md b/README.md
index a8cc1e4..84d21ab 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,16 @@ Minimal images contain Postgres, and the following extensions:
 
 Standard images are based on minimal images, and contain additional extension and tools.
 
-- PGAudit
+- pgAudit
 - PostGIS
 - pgVector
+- pgEdge Vectorizer
+- pg_tokenizer
+- vchord_bm25
+- pg_vectorize
+- pgmq
+- pg_cron
+- pg_stat_monitor
 - Patroni
 - pgBackRest
 - psycopg2
diff --git a/examples/compose/distributed/docker-compose.yaml b/examples/compose/distributed/docker-compose.yaml
index 2892f4a..a49dd81 100644
--- a/examples/compose/distributed/docker-compose.yaml
+++ b/examples/compose/distributed/docker-compose.yaml
@@ -12,6 +12,7 @@ services:
       PGEDGE_USER: ${REPL_USER:-pgedge}
       PGEDGE_PASSWORD: ${REPL_PASSWORD:-password}
       NODE_NAME: n1
+      NODE_ORDINAL: 1
     ports:
       - target: 5432
         published: 6432
@@ -24,8 +25,8 @@ services:
       - source: init-extensions
         target: /docker-entrypoint-initdb.d/10-init-extensions.sh
         mode: 0755
-      - source: configure-spock
-        target: /docker-entrypoint-initdb.d/20-configure-spock.sh
+      - source: init-pgconf
+        target: /docker-entrypoint-initdb.d/20-init-pgconf.sh
         mode: 0755
       - source: restart-postgres
         target: /docker-entrypoint-initdb.d/30-restart-postgres.sh
@@ -51,6 +52,7 @@ services:
       PGEDGE_USER: ${REPL_USER:-pgedge}
       PGEDGE_PASSWORD: ${REPL_PASSWORD:-password}
       NODE_NAME: n2
+      NODE_ORDINAL: 2
     ports:
       - target: 5432
         published: 6433
@@ -63,8 +65,8 @@ services:
       - source: init-extensions
         target: /docker-entrypoint-initdb.d/10-init-extensions.sh
         mode: 0755
-      - source: configure-spock
-        target: /docker-entrypoint-initdb.d/20-configure-spock.sh
+      - source: init-pgconf
+        target: /docker-entrypoint-initdb.d/20-init-pgconf.sh
         mode: 0755
       - source: restart-postgres
         target: /docker-entrypoint-initdb.d/30-restart-postgres.sh
@@ -109,7 +111,7 @@ configs:
       #!/usr/bin/env bash
       set -Eeo pipefail
 
-      EXTENSIONS=("pg_stat_statements" "pgaudit" "snowflake" "spock" "postgis-3")
+      EXTENSIONS=("pg_stat_statements" "pgaudit" "snowflake" "spock" "postgis-3" "pg_stat_monitor" "pg_tokenizer" "pg_cron" "vectorize" "pgedge_vectorizer")
 
       PGCONF="$$PGDATA/postgresql.conf"
 
@@ -122,14 +124,14 @@ configs:
       else
         echo "shared_preload_libraries = '$$LIBS'" >> "$$PGCONF"
       fi
-  configure-spock:
+  init-pgconf:
     content: |-
       #!/usr/bin/env bash
       set -Eeo pipefail
 
       PGCONF="$$PGDATA/postgresql.conf"
 
-      echo "Initializing required spock configuration parameters in postgresql.conf"
+      echo "Initializing required configuration parameters in postgresql.conf"
 
       # Allow connections from any address (for demo purposes)
       echo "listen_addresses = '*'"              >> "$$PGCONF"
@@ -148,6 +150,13 @@ configs:
       echo "spock.conflict_resolution = 'last_update_wins'" >> "$$PGCONF"
       echo "spock.save_resolutions = 'on'"                  >> "$$PGCONF"
       echo "spock.conflict_log_level = 'DEBUG'"             >> "$$PGCONF"
+      
+      # Set LOLOR and Snowflake parameters
+      echo "lolor.node = '$${NODE_ORDINAL}'" >> "$$PGCONF"
+      echo "snowflake.node_id = '$${NODE_ORDINAL}'" >> "$$PGCONF"
+      
+      # Setup pg_cron
+      echo "cron.database_name = '$${POSTGRES_DB:-example_db}'" >> "$$PGCONF"
   restart-postgres:
     content: |-
       #!/usr/bin/env bash
@@ -160,7 +169,7 @@ configs:
       #!/usr/bin/env bash
       set -Eeo pipefail
 
-      EXTENSIONS=("pg_stat_statements" "pgaudit" "snowflake" "spock" "vector" "postgis")
+      EXTENSIONS=("pg_stat_statements" "pgaudit" "snowflake" "spock" "vector" "postgis" "lolor" "pgmq" "pg_cron" "pg_stat_monitor" "pg_tokenizer" "vectorize" "pgedge_vectorizer")
 
       echo "Initializing extensions: $${EXTENSIONS[*]}"
       for EXT in "$${EXTENSIONS[@]}"; do
diff --git a/examples/compose/enterprise/README.md b/examples/compose/enterprise/README.md
index 6a74a02..f899f4c 100644
--- a/examples/compose/enterprise/README.md
+++ b/examples/compose/enterprise/README.md
@@ -1,6 +1,6 @@
 # pgEdge Enterprise Postgres - Docker Compose Example
 
-This example spins up a single pgEdge Enterprise Postgres container with additional enterprise extensions enabled (pgAudit, PostGIS, Snowflake, Spock, etc.). The container is configured with logical replication support and initializes all extensions automatically at startup.
+This example spins up a single pgEdge Enterprise Postgres container with enterprise extensions enabled.
 
 ## Prerequisites
 
@@ -26,41 +26,6 @@ This will build and start the pgEdge Enterprise Postgres service.
 docker compose exec pgedge-postgres psql -U admin example_db
 ```
 
-### Enterprise Extensions
-
-This enterprise image automatically enables and installs the following extensions:
-
-- pg_stat_statements
-- pgAudit
-- Snowflake
-- Spock
-- pgVector
-- PostGIS
-
-These are configured in two phases:
-
-The init-extensions and configure-spock scripts update postgresql.conf with preload libraries and Spock settings.
-
-The create-extensions script runs CREATE EXTENSION commands to load them into your database.
-
-You can confirm extensions are installed by running:
-
-```sh
-\dx
-```
-
-inside your psql session.
-
-### Restarting PostgreSQL During Init
-
-To apply configuration changes, the initialization sequence includes a controlled restart of PostgreSQL:
-
-```sh
-pg_ctl -D $PGDATA -m fast restart
-```
-
-This happens automatically during first startup. You don’t need to run this manually unless you change configuration.
-
 ### Loading Sample Data
 
 You can load the Northwind sample dataset into your Postgres database by running:
diff --git a/examples/compose/enterprise/docker-compose.yaml b/examples/compose/enterprise/docker-compose.yaml
index 246e913..980868c 100644
--- a/examples/compose/enterprise/docker-compose.yaml
+++ b/examples/compose/enterprise/docker-compose.yaml
@@ -7,12 +7,14 @@ services:
       POSTGRES_USER: ${POSTGRES_USER:-admin}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-password}
       POSTGRES_DB: ${POSTGRES_DB:-example_db}
+      NODE_NAME: n1
+      NODE_ORDINAL: 1
     configs:
       - source: init-extensions
         target: /docker-entrypoint-initdb.d/10-init-extensions.sh
         mode: 0755
-      - source: configure-spock
-        target: /docker-entrypoint-initdb.d/20-configure-spock.sh
+      - source: init-pgconf
+        target: /docker-entrypoint-initdb.d/20-init-pgconf.sh
         mode: 0755
       - source: restart-postgres
         target: /docker-entrypoint-initdb.d/30-restart-postgres.sh
@@ -30,7 +32,7 @@ configs:
       #!/usr/bin/env bash
       set -Eeo pipefail
 
-      EXTENSIONS=("pg_stat_statements" "pgaudit" "snowflake" "spock" "postgis-3")
+      EXTENSIONS=("pg_stat_statements" "pgaudit" "snowflake" "spock" "postgis-3" "pg_stat_monitor" "pg_tokenizer" "pg_cron" "vectorize" "pgedge_vectorizer")
 
       PGCONF="$$PGDATA/postgresql.conf"
 
@@ -43,18 +45,18 @@ configs:
       else
         echo "shared_preload_libraries = '$$LIBS'" >> "$$PGCONF"
       fi
-  configure-spock:
+  init-pgconf:
     content: |-
       #!/usr/bin/env bash
       set -Eeo pipefail
 
       PGCONF="$$PGDATA/postgresql.conf"
 
-      echo "Initializing required spock configuration parameters in postgresql.conf"
+      echo "Initializing required configuration parameters in postgresql.conf"
 
       # Allow connections from any address (for demo purposes)
       echo "listen_addresses = '*'"              >> "$$PGCONF"
-      
+
       # Enable logical replication
       echo "wal_level = 'logical'"                     >> "$$PGCONF"
       echo "max_worker_processes = 10"                 >> "$$PGCONF"
@@ -69,6 +71,13 @@ configs:
       echo "spock.conflict_resolution = 'last_update_wins'" >> "$$PGCONF"
       echo "spock.save_resolutions = 'on'"                  >> "$$PGCONF"
       echo "spock.conflict_log_level = 'DEBUG'"             >> "$$PGCONF"
+      
+      # Set LOLOR and Snowflake parameters
+      echo "lolor.node = '$${NODE_ORDINAL}'" >> "$$PGCONF"
+      echo "snowflake.node_id = '$${NODE_ORDINAL}'" >> "$$PGCONF"
+
+      # Setup pg_cron
+      echo "cron.database_name = '$${POSTGRES_DB:-example_db}'" >> "$$PGCONF"
   restart-postgres:
     content: |-
       #!/usr/bin/env bash
@@ -81,7 +90,7 @@ configs:
       #!/usr/bin/env bash
       set -Eeo pipefail
 
-      EXTENSIONS=("pg_stat_statements" "pgaudit" "snowflake" "spock" "vector" "postgis")
+      EXTENSIONS=("pg_stat_statements" "pgaudit" "snowflake" "spock" "vector" "postgis" "lolor" "pgmq" "pg_cron" "pg_stat_monitor" "pg_tokenizer" "vectorize" "pgedge_vectorizer")
 
       echo "Initializing extensions: $${EXTENSIONS[*]}"
       for EXT in "$${EXTENSIONS[@]}"; do
diff --git a/packagelists/amd64/pg16.10-spock5.0.4-minimal.txt b/packagelists/amd64/pg16.10-spock5.0.4-minimal.txt
new file mode 100644
index 0000000..bf7c842
--- /dev/null
+++ b/packagelists/amd64/pg16.10-spock5.0.4-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql16-16.10-1.el9
+pgedge-spock50_16-5.0.4-1.el9
+pgedge-snowflake_16-2.4-1.el9
+pgedge-lolor_16-1.2.1-1.el9
diff --git a/packagelists/amd64/pg16.10-spock5.0.4-standard.txt b/packagelists/amd64/pg16.10-spock5.0.4-standard.txt
new file mode 100644
index 0000000..fb04609
--- /dev/null
+++ b/packagelists/amd64/pg16.10-spock5.0.4-standard.txt
@@ -0,0 +1,16 @@
+pgedge-postgresql16-16.10-1.el9
+pgedge-spock50_16-5.0.4-1.el9
+pgedge-snowflake_16-2.4-1.el9
+pgedge-lolor_16-1.2.1-1.el9
+pgedge-pgaudit_16-16.1-1.el9
+pgedge-postgis35_16-3.5.3-1.el9
+pgedge-pgvector_16-0.8.1-1.el9
+pgedge-pgbackrest-2.57.0-1.el9
+pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_16-1.8.0-1.el9
+pgedge-pg_cron_16-1.6.7-1.el9
+pgedge-pg-tokenizer_16-0.1.1-1.el9
+pgedge-pg-vectorize_16-0.23.0-1.el9
+pgedge-pg-stat-monitor_16-2.3.0-1.el9
+pgedge-vchord-bm25_16-0.2.2-1.el9
+pgedge-vectorizer_16-1.0-beta1_1.el9
diff --git a/packagelists/amd64/pg16.11-spock5.0.4-standard.txt b/packagelists/amd64/pg16.11-spock5.0.4-standard.txt
index 9b29acb..99d7664 100644
--- a/packagelists/amd64/pg16.11-spock5.0.4-standard.txt
+++ b/packagelists/amd64/pg16.11-spock5.0.4-standard.txt
@@ -7,3 +7,10 @@ pgedge-postgis35_16-3.5.3-1.el9
 pgedge-pgvector_16-0.8.1-1.el9
 pgedge-pgbackrest-2.57.0-1.el9
 pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_16-1.8.0-1.el9
+pgedge-pg_cron_16-1.6.7-1.el9
+pgedge-pg-tokenizer_16-0.1.1-1.el9
+pgedge-pg-vectorize_16-0.23.0-1.el9
+pgedge-pg-stat-monitor_16-2.3.0-1.el9
+pgedge-vchord-bm25_16-0.2.2-1.el9
+pgedge-vectorizer_16-1.0-beta1_1.el9
diff --git a/packagelists/amd64/pg17.6-spock5.0.4-minimal.txt b/packagelists/amd64/pg17.6-spock5.0.4-minimal.txt
new file mode 100644
index 0000000..03eb040
--- /dev/null
+++ b/packagelists/amd64/pg17.6-spock5.0.4-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql17-17.6-1.el9
+pgedge-spock50_17-5.0.4-1.el9
+pgedge-snowflake_17-2.4-1.el9
+pgedge-lolor_17-1.2.1-1.el9
diff --git a/packagelists/amd64/pg17.6-spock5.0.4-standard.txt b/packagelists/amd64/pg17.6-spock5.0.4-standard.txt
new file mode 100644
index 0000000..3a3be52
--- /dev/null
+++ b/packagelists/amd64/pg17.6-spock5.0.4-standard.txt
@@ -0,0 +1,16 @@
+pgedge-postgresql17-17.6-1.el9
+pgedge-spock50_17-5.0.4-1.el9
+pgedge-snowflake_17-2.4-1.el9
+pgedge-lolor_17-1.2.1-1.el9
+pgedge-pgaudit_17-17.1-1.el9
+pgedge-postgis35_17-3.5.3-1.el9
+pgedge-pgvector_17-0.8.1-1.el9
+pgedge-pgbackrest-2.57.0-1.el9
+pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_17-1.8.0-1.el9
+pgedge-pg_cron_17-1.6.7-1.el9
+pgedge-pg-tokenizer_17-0.1.1-1.el9
+pgedge-pg-vectorize_17-0.23.0-1.el9
+pgedge-pg-stat-monitor_17-2.3.0-1.el9
+pgedge-vchord-bm25_17-0.2.2-1.el9
+pgedge-vectorizer_17-1.0-beta1_1.el9
diff --git a/packagelists/amd64/pg17.7-spock5.0.4-standard.txt b/packagelists/amd64/pg17.7-spock5.0.4-standard.txt
index 73fcb46..bcf888c 100644
--- a/packagelists/amd64/pg17.7-spock5.0.4-standard.txt
+++ b/packagelists/amd64/pg17.7-spock5.0.4-standard.txt
@@ -7,3 +7,10 @@ pgedge-postgis35_17-3.5.3-1.el9
 pgedge-pgvector_17-0.8.1-1.el9
 pgedge-pgbackrest-2.57.0-1.el9
 pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_17-1.8.0-1.el9
+pgedge-pg_cron_17-1.6.7-1.el9
+pgedge-pg-tokenizer_17-0.1.1-1.el9
+pgedge-pg-vectorize_17-0.23.0-1.el9
+pgedge-pg-stat-monitor_17-2.3.0-1.el9
+pgedge-vchord-bm25_17-0.2.2-1.el9
+pgedge-vectorizer_17-1.0-beta1_1.el9
diff --git a/packagelists/amd64/pg18.0-spock5.0.4-minimal.txt b/packagelists/amd64/pg18.0-spock5.0.4-minimal.txt
new file mode 100644
index 0000000..08894e2
--- /dev/null
+++ b/packagelists/amd64/pg18.0-spock5.0.4-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql18-18.0-1.el9
+pgedge-spock50_18-5.0.4-1.el9
+pgedge-snowflake_18-2.4-1.el9
+pgedge-lolor_18-1.2.1-1.el9
diff --git a/packagelists/amd64/pg18.0-spock5.0.4-standard.txt b/packagelists/amd64/pg18.0-spock5.0.4-standard.txt
new file mode 100644
index 0000000..21ade64
--- /dev/null
+++ b/packagelists/amd64/pg18.0-spock5.0.4-standard.txt
@@ -0,0 +1,16 @@
+pgedge-postgresql18-18.0-1.el9
+pgedge-spock50_18-5.0.4-1.el9
+pgedge-snowflake_18-2.4-1.el9
+pgedge-lolor_18-1.2.1-1.el9
+pgedge-pgaudit_18-18.0-1.el9
+pgedge-postgis35_18-3.5.3-1.el9
+pgedge-pgvector_18-0.8.1-1.el9
+pgedge-pgbackrest-2.57.0-1.el9
+pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_18-1.8.0-1.el9
+pgedge-pg_cron_18-1.6.7-1.el9
+pgedge-pg-tokenizer_18-0.1.1-1.el9
+pgedge-pg-vectorize_18-0.23.0-1.el9
+pgedge-pg-stat-monitor_18-2.3.0-1.el9
+pgedge-vchord-bm25_18-0.2.2-1.el9
+pgedge-vectorizer_18-1.0-beta1_1.el9
diff --git a/packagelists/amd64/pg18.1-spock5.0.4-standard.txt b/packagelists/amd64/pg18.1-spock5.0.4-standard.txt
index b6c918f..078b832 100644
--- a/packagelists/amd64/pg18.1-spock5.0.4-standard.txt
+++ b/packagelists/amd64/pg18.1-spock5.0.4-standard.txt
@@ -7,3 +7,10 @@ pgedge-postgis35_18-3.5.3-1.el9
 pgedge-pgvector_18-0.8.1-1.el9
 pgedge-pgbackrest-2.57.0-1.el9
 pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_18-1.8.0-1.el9
+pgedge-pg_cron_18-1.6.7-1.el9
+pgedge-pg-tokenizer_18-0.1.1-1.el9
+pgedge-pg-vectorize_18-0.23.0-1.el9
+pgedge-pg-stat-monitor_18-2.3.0-1.el9
+pgedge-vchord-bm25_18-0.2.2-1.el9
+pgedge-vectorizer_18-1.0-beta1_1.el9
diff --git a/packagelists/arm64/pg16.10-spock5.0.4-minimal.txt b/packagelists/arm64/pg16.10-spock5.0.4-minimal.txt
new file mode 100644
index 0000000..bf7c842
--- /dev/null
+++ b/packagelists/arm64/pg16.10-spock5.0.4-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql16-16.10-1.el9
+pgedge-spock50_16-5.0.4-1.el9
+pgedge-snowflake_16-2.4-1.el9
+pgedge-lolor_16-1.2.1-1.el9
diff --git a/packagelists/arm64/pg16.10-spock5.0.4-standard.txt b/packagelists/arm64/pg16.10-spock5.0.4-standard.txt
new file mode 100644
index 0000000..fb04609
--- /dev/null
+++ b/packagelists/arm64/pg16.10-spock5.0.4-standard.txt
@@ -0,0 +1,16 @@
+pgedge-postgresql16-16.10-1.el9
+pgedge-spock50_16-5.0.4-1.el9
+pgedge-snowflake_16-2.4-1.el9
+pgedge-lolor_16-1.2.1-1.el9
+pgedge-pgaudit_16-16.1-1.el9
+pgedge-postgis35_16-3.5.3-1.el9
+pgedge-pgvector_16-0.8.1-1.el9
+pgedge-pgbackrest-2.57.0-1.el9
+pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_16-1.8.0-1.el9
+pgedge-pg_cron_16-1.6.7-1.el9
+pgedge-pg-tokenizer_16-0.1.1-1.el9
+pgedge-pg-vectorize_16-0.23.0-1.el9
+pgedge-pg-stat-monitor_16-2.3.0-1.el9
+pgedge-vchord-bm25_16-0.2.2-1.el9
+pgedge-vectorizer_16-1.0-beta1_1.el9
diff --git a/packagelists/arm64/pg16.11-spock5.0.4-standard.txt b/packagelists/arm64/pg16.11-spock5.0.4-standard.txt
index 9b29acb..99d7664 100644
--- a/packagelists/arm64/pg16.11-spock5.0.4-standard.txt
+++ b/packagelists/arm64/pg16.11-spock5.0.4-standard.txt
@@ -7,3 +7,10 @@ pgedge-postgis35_16-3.5.3-1.el9
 pgedge-pgvector_16-0.8.1-1.el9
 pgedge-pgbackrest-2.57.0-1.el9
 pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_16-1.8.0-1.el9
+pgedge-pg_cron_16-1.6.7-1.el9
+pgedge-pg-tokenizer_16-0.1.1-1.el9
+pgedge-pg-vectorize_16-0.23.0-1.el9
+pgedge-pg-stat-monitor_16-2.3.0-1.el9
+pgedge-vchord-bm25_16-0.2.2-1.el9
+pgedge-vectorizer_16-1.0-beta1_1.el9
diff --git a/packagelists/arm64/pg17.6-spock5.0.4-minimal.txt b/packagelists/arm64/pg17.6-spock5.0.4-minimal.txt
new file mode 100644
index 0000000..03eb040
--- /dev/null
+++ b/packagelists/arm64/pg17.6-spock5.0.4-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql17-17.6-1.el9
+pgedge-spock50_17-5.0.4-1.el9
+pgedge-snowflake_17-2.4-1.el9
+pgedge-lolor_17-1.2.1-1.el9
diff --git a/packagelists/arm64/pg17.6-spock5.0.4-standard.txt b/packagelists/arm64/pg17.6-spock5.0.4-standard.txt
new file mode 100644
index 0000000..3a3be52
--- /dev/null
+++ b/packagelists/arm64/pg17.6-spock5.0.4-standard.txt
@@ -0,0 +1,16 @@
+pgedge-postgresql17-17.6-1.el9
+pgedge-spock50_17-5.0.4-1.el9
+pgedge-snowflake_17-2.4-1.el9
+pgedge-lolor_17-1.2.1-1.el9
+pgedge-pgaudit_17-17.1-1.el9
+pgedge-postgis35_17-3.5.3-1.el9
+pgedge-pgvector_17-0.8.1-1.el9
+pgedge-pgbackrest-2.57.0-1.el9
+pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_17-1.8.0-1.el9
+pgedge-pg_cron_17-1.6.7-1.el9
+pgedge-pg-tokenizer_17-0.1.1-1.el9
+pgedge-pg-vectorize_17-0.23.0-1.el9
+pgedge-pg-stat-monitor_17-2.3.0-1.el9
+pgedge-vchord-bm25_17-0.2.2-1.el9
+pgedge-vectorizer_17-1.0-beta1_1.el9
diff --git a/packagelists/arm64/pg17.7-spock5.0.4-standard.txt b/packagelists/arm64/pg17.7-spock5.0.4-standard.txt
index 73fcb46..bcf888c 100644
--- a/packagelists/arm64/pg17.7-spock5.0.4-standard.txt
+++ b/packagelists/arm64/pg17.7-spock5.0.4-standard.txt
@@ -7,3 +7,10 @@ pgedge-postgis35_17-3.5.3-1.el9
 pgedge-pgvector_17-0.8.1-1.el9
 pgedge-pgbackrest-2.57.0-1.el9
 pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_17-1.8.0-1.el9
+pgedge-pg_cron_17-1.6.7-1.el9
+pgedge-pg-tokenizer_17-0.1.1-1.el9
+pgedge-pg-vectorize_17-0.23.0-1.el9
+pgedge-pg-stat-monitor_17-2.3.0-1.el9
+pgedge-vchord-bm25_17-0.2.2-1.el9
+pgedge-vectorizer_17-1.0-beta1_1.el9
diff --git a/packagelists/arm64/pg18.0-spock5.0.4-minimal.txt b/packagelists/arm64/pg18.0-spock5.0.4-minimal.txt
new file mode 100644
index 0000000..08894e2
--- /dev/null
+++ b/packagelists/arm64/pg18.0-spock5.0.4-minimal.txt
@@ -0,0 +1,4 @@
+pgedge-postgresql18-18.0-1.el9
+pgedge-spock50_18-5.0.4-1.el9
+pgedge-snowflake_18-2.4-1.el9
+pgedge-lolor_18-1.2.1-1.el9
diff --git a/packagelists/arm64/pg18.0-spock5.0.4-standard.txt b/packagelists/arm64/pg18.0-spock5.0.4-standard.txt
new file mode 100644
index 0000000..21ade64
--- /dev/null
+++ b/packagelists/arm64/pg18.0-spock5.0.4-standard.txt
@@ -0,0 +1,16 @@
+pgedge-postgresql18-18.0-1.el9
+pgedge-spock50_18-5.0.4-1.el9
+pgedge-snowflake_18-2.4-1.el9
+pgedge-lolor_18-1.2.1-1.el9
+pgedge-pgaudit_18-18.0-1.el9
+pgedge-postgis35_18-3.5.3-1.el9
+pgedge-pgvector_18-0.8.1-1.el9
+pgedge-pgbackrest-2.57.0-1.el9
+pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_18-1.8.0-1.el9
+pgedge-pg_cron_18-1.6.7-1.el9
+pgedge-pg-tokenizer_18-0.1.1-1.el9
+pgedge-pg-vectorize_18-0.23.0-1.el9
+pgedge-pg-stat-monitor_18-2.3.0-1.el9
+pgedge-vchord-bm25_18-0.2.2-1.el9
+pgedge-vectorizer_18-1.0-beta1_1.el9
diff --git a/packagelists/arm64/pg18.1-spock5.0.4-standard.txt b/packagelists/arm64/pg18.1-spock5.0.4-standard.txt
index b6c918f..078b832 100644
--- a/packagelists/arm64/pg18.1-spock5.0.4-standard.txt
+++ b/packagelists/arm64/pg18.1-spock5.0.4-standard.txt
@@ -7,3 +7,10 @@ pgedge-postgis35_18-3.5.3-1.el9
 pgedge-pgvector_18-0.8.1-1.el9
 pgedge-pgbackrest-2.57.0-1.el9
 pgedge-python3-psycopg2-2.9.10-1.el9
+pgedge-pgmq_18-1.8.0-1.el9
+pgedge-pg_cron_18-1.6.7-1.el9
+pgedge-pg-tokenizer_18-0.1.1-1.el9
+pgedge-pg-vectorize_18-0.23.0-1.el9
+pgedge-pg-stat-monitor_18-2.3.0-1.el9
+pgedge-vchord-bm25_18-0.2.2-1.el9
+pgedge-vectorizer_18-1.0-beta1_1.el9
diff --git a/pgedge.docker-bake.hcl b/pgedge.docker-bake.hcl
index aaed59f..70e1cda 100644
--- a/pgedge.docker-bake.hcl
+++ b/pgedge.docker-bake.hcl
@@ -4,7 +4,6 @@
 
 variable "PACKAGE_RELEASE_CHANNEL" {
   type    = string
-  default = ""
 }
 
 variable "POSTGRES_MAJOR_VERSION" {
diff --git a/scripts/build_pgedge_images.py b/scripts/build_pgedge_images.py
index fddf19d..0e30445 100755
--- a/scripts/build_pgedge_images.py
+++ b/scripts/build_pgedge_images.py
@@ -159,25 +159,46 @@ def make_all_flavor_images(
 all_images: list[PgEdgeImage] = [
     # pg16 images
     *make_all_flavor_images(
-        postgres_version="16.11",
+        postgres_version="16.10",
         spock_version="5.0.4",
         epoch=2,
+        is_latest_for_pg_major=False,
+        is_latest_for_spock_major=True,
+    ),
+    *make_all_flavor_images(
+        postgres_version="16.11",
+        spock_version="5.0.4",
+        epoch=3,
         is_latest_for_pg_major=True,
         is_latest_for_spock_major=True,
     ),
     # pg17 images
     *make_all_flavor_images(
-        postgres_version="17.7",
+        postgres_version="17.6",
         spock_version="5.0.4",
         epoch=2,
+        is_latest_for_pg_major=False,
+        is_latest_for_spock_major=True,
+    ),
+    *make_all_flavor_images(
+        postgres_version="17.7",
+        spock_version="5.0.4",
+        epoch=3,
         is_latest_for_pg_major=True,
         is_latest_for_spock_major=True,
     ),
     # pg18 images
     *make_all_flavor_images(
-        postgres_version="18.1",
+        postgres_version="18.0",
         spock_version="5.0.4",
         epoch=2,
+        is_latest_for_pg_major=False,
+        is_latest_for_spock_major=True,
+    ),
+    *make_all_flavor_images(
+        postgres_version="18.1",
+        spock_version="5.0.4",
+        epoch=3,
         is_latest_for_pg_major=True,
         is_latest_for_spock_major=True,
     ),