diff --git a/ansible/inventory.yml b/ansible/inventory.yml
index 5e4412d45..79303d49f 100644
--- a/ansible/inventory.yml
+++ b/ansible/inventory.yml
@@ -120,7 +120,7 @@ hosts:
         msft-win2022_vs2019-x64-4: {ip: nodejs2.eastus.cloudapp.azure.com}
 
     - digitalocean:
-        debian8-x64-1: {ip: 159.203.103.52}
+        debian11-x64-1: {ip: 174.138.79.159}
         debian9-x64-1: {ip: 138.197.97.208}
         fedora32-x64-1: {ip: 159.203.117.50}
         fedora37-x64-1: {ip: 159.65.248.149}
diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
index 5d2237302..33815ba71 100644
--- a/ansible/roles/baselayout/vars/main.yml
+++ b/ansible/roles/baselayout/vars/main.yml
@@ -16,7 +16,7 @@ sshd_service_map: {
 sshd_service_name: "{{ sshd_service_map[os]|default(sshd_service_map[os|stripversion])|default('sshd') }}"
 
 ntp_service: {
-  chrony: ['rhel8'],
+  chrony: ['rhel8', 'debian11'],
   systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804']
 }
 
@@ -71,6 +71,10 @@ packages: {
     'gcc-8,g++-8,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip',
   ],
 
+  debian11: [
+    'gcc-10,g++-10,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip',
+  ],
+
   fedora: [
     'bzip2,ccache,gcc-c++,git,fontconfig,sudo,make,python3-pip',
   ],
diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
index 9ee92411f..4c2191f9b 100644
--- a/ansible/roles/java-base/vars/main.yml
+++ b/ansible/roles/java-base/vars/main.yml
@@ -9,6 +9,7 @@ packages: {
   'debian8': 'oracle-java8-installer',
   'debian9': 'openjdk-8-jre-headless',
   'debian10': 'openjdk-11-jre-headless',
+  'debian11': 'openjdk-17-jre-headless',
   'fedora': 'java-17-openjdk-headless',
   'fedora32': 'java-11-openjdk-headless',
   'freebsd': 'openjdk11-jre',
diff --git a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/debian.yml b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/debian.yml
deleted file mode 100644
index f647f36f7..000000000
--- a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/debian.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-
-#
-# debian: python2.7
-#
-
-- name: install pip
-  package: name=python-pip state=present
-
-- name: install tap2junit
-  pip: name=tap2junit state=present
diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
index cce53559f..40dc3caa7 100644
--- a/ansible/roles/jenkins-worker/vars/main.yml
+++ b/ansible/roles/jenkins-worker/vars/main.yml
@@ -9,7 +9,7 @@ init: {
   freebsd: 'freebsd',
   ibmi: 'ibmi73',
   macos: 'macos',
-  systemd: ['centos7', 'debian8', 'debian9', 'debian10', 'fedora', 'rhel7', 'rhel8', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
+  systemd: ['centos7', 'debian', 'fedora', 'rhel7', 'rhel8', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
   svc: 'smartos',
   zos_start: 'zos'
   }