diff --git a/tasks/php-fpm.yml b/tasks/php-fpm.yml
index c531f7d..f1a7249 100644
--- a/tasks/php-fpm.yml
+++ b/tasks/php-fpm.yml
@@ -18,21 +18,35 @@
 
 - name: "setup  repository - debian"
   block:
-    - name: setup repo key
-      ansible.builtin.get_url:
-        url: https://packages.sury.org/php/apt.gpg
-        dest: /etc/apt/keyrings/sury_php.gpg
+  - name: Check if my_package is installed
+    command: dpkg-query -W debsuryorg-archive-keyring
+    register: my_package_check_deb
+    failed_when: my_package_check_deb.rc > 1
+    changed_when: my_package_check_deb.rc == 1
+    
+  - name: setup repo key
+    ansible.builtin.get_url:
+      url: https://packages.sury.org/debsuryorg-archive-keyring.deb
+      dest: /tmp/debsuryorg-archive-keyring.deb
+    when: my_package_check_deb.rc==1
 
-    - name: setup source list
-      ansible.builtin.template:
+  - name: install key
+    ansible.builtin.apt:
+      state: present
+      deb: /tmp/debsuryorg-archive-keyring.deb
+    when: my_package_check_deb.rc==1
+
+
+  - name: setup source list
+    ansible.builtin.template:
         src: php_sury_sources.list
         dest: /etc/apt/sources.list.d/php_sury.sources.list
-      register: repo_setup
+    register: repo_setup
 
-    - name: update cache
-      ansible.builtin.apt:
+  - name: update cache
+    ansible.builtin.apt:
         update_cache: true
-      when: repo_setup.changed
+    when: repo_setup.changed
   when: ansible_os_family | lower == 'debian'
 
 - name: create socket directory if needed
@@ -50,6 +64,7 @@
   ansible.builtin.package:
     name: "{{ php_packages }}"
     state: present
+  when: php_packages is defined
 
 - name: disable default pool
   copy:
diff --git a/templates/php_sury_sources.list b/templates/php_sury_sources.list
index 42481d4..089db17 100644
--- a/templates/php_sury_sources.list
+++ b/templates/php_sury_sources.list
@@ -1,2 +1,2 @@
-"{{ ansible_managed }}"
-deb [signed-by=/etc/apt/keyrings/sury_php.gpg] https://packages.sury.org/php/ {{ ansible_distribution_release }} main
+#{{ ansible_managed }}
+deb [signed-by=/etc/apt/trusted.gpg.d/debsuryorg-archive.gpg] https://packages.sury.org/php/ {{ ansible_distribution_release }} main
diff --git a/templates/www.conf b/templates/www.conf
index e39c6fe..454f9bf 100644
--- a/templates/www.conf
+++ b/templates/www.conf
@@ -1,4 +1,4 @@
-"{{ ansible_managed }}"
+;{{ ansible_managed }}
 [{{ php_pool_name }}]
 user = {{ php_fpm_pool_user }}
 group = {{ php_fpm_pool_group }}