diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml
index dab9f697..15ef0cac 100644
--- a/roles/common/tasks/packages.yml
+++ b/roles/common/tasks/packages.yml
@@ -42,9 +42,9 @@
       - python-jinja2
       - python-kerberos
       - python-markupsafe
-      - python-netaddr
+#      - python-netaddr
       - python-paramiko
-      - python-pip
+#      - python-pip
       - python-pymysql
       - python-selinux
       - python-xmltodict
diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml
index 5e9d8b88..e1345906 100644
--- a/roles/shell/tasks/packages.yml
+++ b/roles/shell/tasks/packages.yml
@@ -24,7 +24,7 @@
 
 - name: Add weechat repo
   apt_repository: 
-    repo: 'deb https://weechat.org/debian buster main' 
+    repo: 'deb https://weechat.org/debian bullseye main' 
     state: present
     filename: weechat
     update_cache: yes
@@ -43,15 +43,15 @@
     
 - name: Add debian contrib
   apt_repository:
-    repo: 'deb http://ftp.de.debian.org/debian stable main contrib'
+    repo: 'deb http://ftp.de.debian.org/debian bullseye main contrib'
     state: present
     update_cache: yes
 
-- name: Add mono-project repo
-  apt_repository:
-    repo: 'deb https://download.mono-project.com/repo/debian stable-buster main' 
-    state: present
-    update_cache: yes
+#- name: Add mono-project repo
+#  apt_repository:
+#    repo: 'deb https://download.mono-project.com/repo/debian bullseye main' 
+#    state: present
+#    update_cache: yes
 
 - name: Install baseline packages
   apt: 
@@ -72,7 +72,7 @@
       - bzflag-server
       - ca-certificates-mono
       - caca-utils
-#      - clang
+      - clang
       - cloc
       - cmake
       - cmark
@@ -194,13 +194,13 @@
       - php-mysql
       - php-ps
       - php-pspell
-      - php-recode
+#      - php-recode
       - php-sqlite3
       - php-tidy
       - php-xmlrpc
-      - php7.3-xsl
-      - php7.3-curl
-      - php7.3-xml
+#      - php7.3-xsl
+#      - php7.3-curl
+#      - php7.3-xml
       - pngtools
       - postfix-policyd-spf-python
       - poezio
@@ -209,7 +209,7 @@
       - python
       - python-certbot-apache
       - python-flask
-      - python-pip
+#      - python-pip
 #      - python-potr
       - python-twisted
       - python3
diff --git a/roles/webserver/tasks/packages.yml b/roles/webserver/tasks/packages.yml
index 94a915a8..a84d462a 100644
--- a/roles/webserver/tasks/packages.yml
+++ b/roles/webserver/tasks/packages.yml
@@ -7,14 +7,14 @@
 
 - name: Add tor project repo
   apt_repository:
-    repo: 'deb https://deb.torproject.org/torproject.org buster main'
+    repo: 'deb https://deb.torproject.org/torproject.org bullseye main'
     state: present
     filename: tor
     update_cache: yes
 
 - name: Add tor project repo
   apt_repository:
-    repo: 'deb-src https://deb.torproject.org/torproject.org buster main'
+    repo: 'deb-src https://deb.torproject.org/torproject.org bullseye main'
     state: present
     filename: torsrc
     update_cache: yes
@@ -27,7 +27,7 @@
   vars:
     packages:
       - apache2
-      - createrepo
+#      - createrepo
       - dpkg-dev
 #      - gophernicus
       - mariadb-client
@@ -43,11 +43,11 @@
       - php-intl
       - php-mysql
       - php-pspell
-      - php-recode
+#      - php-recode
       - php-sqlite3
       - php-tidy
       - php-xmlrpc
-      - php7.3-xsl
+#      - php7.3-xsl
       - tor
       - torsocks
-      - yum-utils
+#      - yum-utils