diff --git a/products/frigate/inputs.tf b/products/frigate/inputs.tf
index 23f8780..99fa416 100644
--- a/products/frigate/inputs.tf
+++ b/products/frigate/inputs.tf
@@ -1,3 +1,8 @@
+variable "enable" {
+  type        = bool
+  description = "Whether to enable the service or merely provision it."
+  default     = true
+}
 variable "stack_name" {
   type        = string
   description = "The name of the stack to deploy the service to."
diff --git a/products/mysql/inputs.tf b/products/mysql/inputs.tf
index c1945f9..ee2f6f4 100644
--- a/products/mysql/inputs.tf
+++ b/products/mysql/inputs.tf
@@ -1,3 +1,8 @@
+variable "enable" {
+  type        = bool
+  description = "Whether to enable the service or merely provision it."
+  default     = true
+}
 variable "mysql_image" {
   default     = "mariadb"
   type        = string
diff --git a/products/mysql/mysql.tf b/products/mysql/mysql.tf
index 783292c..e63bf22 100644
--- a/products/mysql/mysql.tf
+++ b/products/mysql/mysql.tf
@@ -1,5 +1,6 @@
 module "service" {
   source                   = "../../docker/service"
+  enable                   = var.enable
   image                    = "${var.mysql_image}:${var.mysql_version}"
   stack_name               = var.stack_name
   service_name             = var.service_name
diff --git a/products/openhaystack/inputs.tf b/products/openhaystack/inputs.tf
index fd75fa8..2ec4feb 100644
--- a/products/openhaystack/inputs.tf
+++ b/products/openhaystack/inputs.tf
@@ -1,3 +1,8 @@
+variable "enable" {
+  type        = bool
+  description = "Whether to enable the service or merely provision it."
+  default     = true
+}
 # Pass-thru variables
 variable "stack_name" {
   type = string
diff --git a/products/openhaystack/openhaystack.tf b/products/openhaystack/openhaystack.tf
index 68fec1e..efe5226 100644
--- a/products/openhaystack/openhaystack.tf
+++ b/products/openhaystack/openhaystack.tf
@@ -5,6 +5,7 @@ module "network" {
 module "anisette" {
   source                = "../../docker/service"
   image                 = "dadoum/anisette-v3-server"
+  enable                = var.enable
   stack_name            = var.stack_name
   service_name          = "anisette"
   networks              = concat(var.networks, [module.network])
@@ -17,6 +18,7 @@ module "anisette" {
 }
 module "macless-haystack" {
   source                = "../../docker/service"
+  enable                = var.enable
   stack_name            = var.stack_name
   service_name          = "macless-haystack"
   image                 = "christld/macless-haystack"
diff --git a/products/pgadmin/inputs.tf b/products/pgadmin/inputs.tf
index 4ef317c..419d9f6 100644
--- a/products/pgadmin/inputs.tf
+++ b/products/pgadmin/inputs.tf
@@ -1,4 +1,4 @@
-variable "enabled" {
+variable "enable" {
   type        = bool
   description = "Whether to enable the service or merely provision it."
   default     = true
diff --git a/products/pgadmin/pgadmin.tf b/products/pgadmin/pgadmin.tf
index df2b607..267e765 100644
--- a/products/pgadmin/pgadmin.tf
+++ b/products/pgadmin/pgadmin.tf
@@ -21,7 +21,7 @@ variable "servers" {
 }
 module "pgadmin" {
   source                = "../../docker/service"
-  enable                = var.enabled
+  enable                = var.enable
   image                 = "dpage/pgadmin4:8"
   service_name          = "pgadmin"
   stack_name            = "pgadmin"
diff --git a/products/pgbackweb/inputs.tf b/products/pgbackweb/inputs.tf
index f78ee6b..7507a84 100644
--- a/products/pgbackweb/inputs.tf
+++ b/products/pgbackweb/inputs.tf
@@ -1,4 +1,4 @@
-variable "enabled" {
+variable "enable" {
   type        = bool
   description = "Whether to enable the service or merely provision it."
   default     = true
diff --git a/products/pgbackweb/pgbackweb.tf b/products/pgbackweb/pgbackweb.tf
index 127bfc4..8c517b2 100644
--- a/products/pgbackweb/pgbackweb.tf
+++ b/products/pgbackweb/pgbackweb.tf
@@ -8,7 +8,7 @@ resource "random_password" "encryption_key" {
 }
 module "pgbackweb" {
   source = "../../docker/service"
-  enable = var.enabled
+  enable = var.enable
   image  = "${var.pgbackweb_image}:${var.pgbackweb_version}"
   environment_variables = {
     PBW_ENCRYPTION_KEY       = nonsensitive(random_password.encryption_key.result)
@@ -22,7 +22,9 @@ module "pgbackweb" {
 }
 module "postgres" {
   source                = "../postgres"
-  postgres_version      = "16"
+  enable                = var.enable
+  postgres_version      = "17"
+  service_name          = "pgbackweb-postgres"
   stack_name            = var.stack_name
   networks              = [module.network]
   placement_constraints = var.placement_constraints