diff --git a/README.rst b/README.rst
index f15bff7..3db3493 100644
--- a/README.rst
+++ b/README.rst
@@ -184,6 +184,15 @@
           user_storage: 0
         ....
 
+Maximum size of image
+
+.. code-block:: yaml
+
+    glance:
+      server:
+        ....
+        image_size_cap: 2199023255552 # 2TB, twice current default
+
 Configuring TLS communications
 ------------------------------
 
diff --git a/_modules/glanceng.py b/_modules/glanceng.py
index 080de42..d607fef 100644
--- a/_modules/glanceng.py
+++ b/_modules/glanceng.py
@@ -94,8 +94,12 @@
     Only intended to be used within glance-enabled modules
     '''
 
+    endpoint_type = str(connection_args.get('connection_endpoint_type',
+                                            'internal'))
     kstone = __salt__['keystoneng.auth'](profile, **connection_args)
-    g_endpoint = __salt__['keystoneng.endpoint_get']('glance', profile=profile)
+    g_endpoint = __salt__['keystoneng.endpoint_get']('glance',
+                                                     profile=profile,
+                                                     interface=endpoint_type)
     glance_client = client.Client(api_version, session=kstone.session, endpoint=g_endpoint.get('url'))
     return glance_client
 
diff --git a/glance/files/grafana_dashboards/glance_prometheus.json b/glance/files/grafana_dashboards/glance_prometheus.json
index 0ff8930..824d7e9 100755
--- a/glance/files/grafana_dashboards/glance_prometheus.json
+++ b/glance/files/grafana_dashboards/glance_prometheus.json
@@ -72,16 +72,15 @@
           "tableColumn": "",
           "targets": [
             {
-              "expr": "min(openstack_api_check_status{service=~\"glance.*\"})",
+              "expr": "openstack_api_check_status{interface=\"public\",service_name=\"glance\"}",
               "format": "time_series",
               "intervalFactor": 2,
-              "legendFormat": "{{ service }}",
               "refId": "A",
               "step": 60
             }
           ],
           "thresholds": "0.5,1.5",
-          "title": "API Availability",
+          "title": "Public VIP API Availability",
           "type": "singlestat",
           "valueFontSize": "80%",
           "valueMaps": [
diff --git a/glance/files/grafana_dashboards/glance_prometheus_fluentd.json b/glance/files/grafana_dashboards/glance_prometheus_fluentd.json
index 2dd3609..9028a6c 100755
--- a/glance/files/grafana_dashboards/glance_prometheus_fluentd.json
+++ b/glance/files/grafana_dashboards/glance_prometheus_fluentd.json
@@ -97,14 +97,14 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "min(openstack_api_check_status{name=\"glance\"})",
+          "expr": "openstack_api_check_status{interface=\"public\",service_name=\"glance\"}",
           "format": "time_series",
           "intervalFactor": 2,
           "refId": "A"
         }
       ],
       "thresholds": "0.5,0.5",
-      "title": "VIP API availability",
+      "title": "Public VIP API Availability",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
diff --git a/glance/files/pike/glance-api.conf.Debian b/glance/files/pike/glance-api.conf.Debian
index 1bcf77a..75f7508 100644
--- a/glance/files/pike/glance-api.conf.Debian
+++ b/glance/files/pike/glance-api.conf.Debian
@@ -385,6 +385,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/files/pike/glance-cache.conf.Debian b/glance/files/pike/glance-cache.conf.Debian
index 045fdaa..90fb4a2 100644
--- a/glance/files/pike/glance-cache.conf.Debian
+++ b/glance/files/pike/glance-cache.conf.Debian
@@ -257,6 +257,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/files/pike/glance-registry.conf.Debian b/glance/files/pike/glance-registry.conf.Debian
index fc755df..c1fcabc 100644
--- a/glance/files/pike/glance-registry.conf.Debian
+++ b/glance/files/pike/glance-registry.conf.Debian
@@ -341,6 +341,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/files/pike/glance-scrubber.conf.Debian b/glance/files/pike/glance-scrubber.conf.Debian
index 712e0d1..5b8b197 100644
--- a/glance/files/pike/glance-scrubber.conf.Debian
+++ b/glance/files/pike/glance-scrubber.conf.Debian
@@ -257,6 +257,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/files/queens/glance-api.conf.Debian b/glance/files/queens/glance-api.conf.Debian
index 1ff03d1..46a627a 100644
--- a/glance/files/queens/glance-api.conf.Debian
+++ b/glance/files/queens/glance-api.conf.Debian
@@ -397,6 +397,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/files/queens/glance-cache.conf.Debian b/glance/files/queens/glance-cache.conf.Debian
index ffa0ed6..54344dd 100644
--- a/glance/files/queens/glance-cache.conf.Debian
+++ b/glance/files/queens/glance-cache.conf.Debian
@@ -270,6 +270,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/files/queens/glance-registry.conf.Debian b/glance/files/queens/glance-registry.conf.Debian
index ff0668a..fbb677b 100644
--- a/glance/files/queens/glance-registry.conf.Debian
+++ b/glance/files/queens/glance-registry.conf.Debian
@@ -354,6 +354,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/files/queens/glance-scrubber.conf.Debian b/glance/files/queens/glance-scrubber.conf.Debian
index 30b5154..69bfb50 100644
--- a/glance/files/queens/glance-scrubber.conf.Debian
+++ b/glance/files/queens/glance-scrubber.conf.Debian
@@ -270,6 +270,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/files/rocky/glance-api.conf.Debian b/glance/files/rocky/glance-api.conf.Debian
index 67d90c7..6f7a4e8 100644
--- a/glance/files/rocky/glance-api.conf.Debian
+++ b/glance/files/rocky/glance-api.conf.Debian
@@ -445,6 +445,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Deploy the v2 OpenStack Images API.
diff --git a/glance/files/rocky/glance-cache.conf.Debian b/glance/files/rocky/glance-cache.conf.Debian
index d9aae37..156e21f 100644
--- a/glance/files/rocky/glance-cache.conf.Debian
+++ b/glance/files/rocky/glance-cache.conf.Debian
@@ -299,6 +299,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/files/rocky/glance-registry.conf.Debian b/glance/files/rocky/glance-registry.conf.Debian
index e79696e..5c009b4 100644
--- a/glance/files/rocky/glance-registry.conf.Debian
+++ b/glance/files/rocky/glance-registry.conf.Debian
@@ -388,6 +388,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/files/rocky/glance-scrubber.conf.Debian b/glance/files/rocky/glance-scrubber.conf.Debian
index 103748c..29a1006 100644
--- a/glance/files/rocky/glance-scrubber.conf.Debian
+++ b/glance/files/rocky/glance-scrubber.conf.Debian
@@ -299,6 +299,9 @@
 # Minimum value: 1
 # Maximum value: 9223372036854775808
 #image_size_cap = 1099511627776
+{%- if server.image_size_cap is defined %}
+image_size_cap = {{ server.image_size_cap }}
+{%- endif %}
 
 #
 # Maximum amount of image storage per tenant.
diff --git a/glance/meta/grafana.yml b/glance/meta/grafana.yml
index 511d2a0..dcc3472 100644
--- a/glance/meta/grafana.yml
+++ b/glance/meta/grafana.yml
@@ -44,4 +44,4 @@
               type: dashboard
             target:
               cluster_status:
-                expr: avg(openstack_api_check_status{service=~"glance.*"})
+                expr: openstack_api_check_status{interface="public",service_name="glance"}
diff --git a/glance/meta/prometheus.yml b/glance/meta/prometheus.yml
index 077999c..ed15da1 100644
--- a/glance/meta/prometheus.yml
+++ b/glance/meta/prometheus.yml
@@ -4,26 +4,6 @@
 {% raw %}
 server:
   alert:
-    GlanceApiOutage:
-      if: >-
-        openstack_api_check_status{name="glance"} == 0
-      labels:
-        severity: critical
-        service: glance
-      annotations:
-        summary: "Glance API outage"
-        description: >-
-          Glance API is not accessible for the Glance endpoint in the OpenStack service catalog.
-    GlareApiOutage:
-      if: >-
-        openstack_api_check_status{name="glare"} == 0
-      labels:
-        severity: critical
-        service: glance
-      annotations:
-        summary: "Glare API outage"
-        description: >-
-          Glare API is not accessible for the Glare endpoint in the OpenStack service catalog.
     GlanceApiEndpointDown:
       if: >-
         http_response_status{name=~"glance.*"} == 0
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index cc20935..7c7c1bf 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -49,6 +49,10 @@
             enabled: ${_param:openstack_fluentd_handler_enabled}
           ossyslog:
             enabled: ${_param:openstack_ossyslog_handler_enabled}
+        loggers:
+          eventletwsgi:
+            enabled: true
+            level: INFO
       message_queue:
         engine: rabbitmq
         host: ${_param:cluster_vip_address}
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index b625557..cd0e146 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -47,6 +47,10 @@
             enabled: ${_param:openstack_fluentd_handler_enabled}
           ossyslog:
             enabled: ${_param:openstack_ossyslog_handler_enabled}
+        loggers:
+          eventletwsgi:
+            enabled: true
+            level: INFO
       message_queue:
         engine: rabbitmq
         host: ${_param:single_address}