diff --git a/README.md b/README.md
index 28995a8..1dcf23b 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Ansible Role for Proxmox PVE Server configuration and Tools
 * Enable no-subscription Repository
 * InfluxDB and Graphite Metric Server configuration
 * LLDP Install
-* System Apt Upgrades
+* System APT Upgrades
 
 ### Planned Features / in Developement
 * Kernel Upgrades incl. old Kernel cleanup
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index ebd1f83..1064f52 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -3,6 +3,11 @@
   hosts: all
   become: true
   pre_tasks:
+    # Subscription Popup 
+    - name: Create JS File
+      file:
+        dest: /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
+        state: present
     # All APT Tasks
     - name: Update apt cache.
       apt:
@@ -18,11 +23,16 @@
     - role: thost96.proxmox
       ignore_errors: true
       vars:
-        # Additional pre-task neccessary
-        disable_subscription_popup: false
+        disable_subscription_popup: true
         disable_enterprise_repo: true
         enable_no_subscription_repo: true
         # Additional pre-task neccessary for influx and graphite / or file validation only
+        metrics_influx: true
+        metrics_influx_server: "influx"
+        metrics_influx_port: 8089
+        metrics_graphite: true
+        metrics_graphite_server: "graphite"
+        metrics_graphite_port: 2003        
         system_upgrades: true
         # Not yet implemented
         system_kernel_upgrade: false
@@ -30,4 +40,4 @@
         system_kernel_clean: false
         # Not yet implemented
         tools_cockpit: false
-        tools_lldp: true
+        tools_lldp: true        
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 55ce197..adfdd8b 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -10,8 +10,8 @@ lint: |
   ansible-lint
 platforms:
   # Proxmox 8.x
-  - name: instance1
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest"
+  - name: debian12
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian12}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
@@ -19,8 +19,8 @@ platforms:
     privileged: true
     pre_build_image: true
   # Proxmox 7.x
-  - name: instance2
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian10}-ansible:latest"
+  - name: debian11
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-debian11}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
diff --git a/tasks/main.yml b/tasks/main.yml
index f64b48b..c334599 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,12 +17,8 @@
 - name: Enable PVE no Subcription Repository
   block:
     - ansible.builtin.get_url:
-        url: https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg
-        dest: /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
-    # - ansible.builtin.apt_key:
-    #     url: https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg
-    #     keyring: /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
-    #     state: present
+        url: https://enterprise.proxmox.com/debian/proxmox-release-{{ ansible_distribution_release }}.gpg
+        dest: /etc/apt/trusted.gpg.d/proxmox-release-{{ ansible_distribution_release }}.gpg
     - apt_repository:
         repo: "deb http://download.proxmox.com/debian/pve {{ ansible_distribution_release }} pve-no-subscription"
         filename: pve-no-subscription