diff --git a/ldap/ldapscripts/debian/deb_patches/debian-align-permission-with-centos.patch b/ldap/ldapscripts/debian/bullseye/deb_patches/debian-align-permission-with-centos.patch
similarity index 100%
rename from ldap/ldapscripts/debian/deb_patches/debian-align-permission-with-centos.patch
rename to ldap/ldapscripts/debian/bullseye/deb_patches/debian-align-permission-with-centos.patch
diff --git a/ldap/ldapscripts/debian/deb_patches/debian-install-cgcs-files.patch b/ldap/ldapscripts/debian/bullseye/deb_patches/debian-install-cgcs-files.patch
similarity index 100%
rename from ldap/ldapscripts/debian/deb_patches/debian-install-cgcs-files.patch
rename to ldap/ldapscripts/debian/bullseye/deb_patches/debian-install-cgcs-files.patch
diff --git a/ldap/ldapscripts/debian/deb_patches/install-ldapscripts-files-to-etc.patch b/ldap/ldapscripts/debian/bullseye/deb_patches/install-ldapscripts-files-to-etc.patch
similarity index 100%
rename from ldap/ldapscripts/debian/deb_patches/install-ldapscripts-files-to-etc.patch
rename to ldap/ldapscripts/debian/bullseye/deb_patches/install-ldapscripts-files-to-etc.patch
diff --git a/ldap/ldapscripts/debian/deb_patches/series b/ldap/ldapscripts/debian/bullseye/deb_patches/series
similarity index 100%
rename from ldap/ldapscripts/debian/deb_patches/series
rename to ldap/ldapscripts/debian/bullseye/deb_patches/series
diff --git a/ldap/ldapscripts/debian/meta_data.yaml b/ldap/ldapscripts/debian/bullseye/meta_data.yaml
similarity index 100%
rename from ldap/ldapscripts/debian/meta_data.yaml
rename to ldap/ldapscripts/debian/bullseye/meta_data.yaml
diff --git a/ldap/ldapscripts/debian/patches/0001-Reset-password-after-user-is-added.patch b/ldap/ldapscripts/debian/bullseye/patches/0001-Reset-password-after-user-is-added.patch
similarity index 100%
rename from ldap/ldapscripts/debian/patches/0001-Reset-password-after-user-is-added.patch
rename to ldap/ldapscripts/debian/bullseye/patches/0001-Reset-password-after-user-is-added.patch
diff --git a/ldap/ldapscripts/debian/patches/0001-Update-ldapsetpasswd-error-message.patch b/ldap/ldapscripts/debian/bullseye/patches/0001-Update-ldapsetpasswd-error-message.patch
similarity index 100%
rename from ldap/ldapscripts/debian/patches/0001-Update-ldapsetpasswd-error-message.patch
rename to ldap/ldapscripts/debian/bullseye/patches/0001-Update-ldapsetpasswd-error-message.patch
diff --git a/ldap/ldapscripts/debian/patches/allow-anonymous-bind-for-ldap-search.patch b/ldap/ldapscripts/debian/bullseye/patches/allow-anonymous-bind-for-ldap-search.patch
similarity index 100%
rename from ldap/ldapscripts/debian/patches/allow-anonymous-bind-for-ldap-search.patch
rename to ldap/ldapscripts/debian/bullseye/patches/allow-anonymous-bind-for-ldap-search.patch
diff --git a/ldap/ldapscripts/debian/patches/install-ldapscripts-files-to-etc.patch b/ldap/ldapscripts/debian/bullseye/patches/install-ldapscripts-files-to-etc.patch
similarity index 100%
rename from ldap/ldapscripts/debian/patches/install-ldapscripts-files-to-etc.patch
rename to ldap/ldapscripts/debian/bullseye/patches/install-ldapscripts-files-to-etc.patch
diff --git a/ldap/ldapscripts/debian/patches/ldap-user-setup-support.patch b/ldap/ldapscripts/debian/bullseye/patches/ldap-user-setup-support.patch
similarity index 100%
rename from ldap/ldapscripts/debian/patches/ldap-user-setup-support.patch
rename to ldap/ldapscripts/debian/bullseye/patches/ldap-user-setup-support.patch
diff --git a/ldap/ldapscripts/debian/patches/ldapscripts-templates.patch b/ldap/ldapscripts/debian/bullseye/patches/ldapscripts-templates.patch
similarity index 100%
rename from ldap/ldapscripts/debian/patches/ldapscripts-templates.patch
rename to ldap/ldapscripts/debian/bullseye/patches/ldapscripts-templates.patch
diff --git a/ldap/ldapscripts/debian/patches/log_timestamp.patch b/ldap/ldapscripts/debian/bullseye/patches/log_timestamp.patch
similarity index 100%
rename from ldap/ldapscripts/debian/patches/log_timestamp.patch
rename to ldap/ldapscripts/debian/bullseye/patches/log_timestamp.patch
diff --git a/ldap/ldapscripts/debian/patches/series b/ldap/ldapscripts/debian/bullseye/patches/series
similarity index 100%
rename from ldap/ldapscripts/debian/patches/series
rename to ldap/ldapscripts/debian/bullseye/patches/series
diff --git a/ldap/ldapscripts/debian/patches/sudo-delete-support.patch b/ldap/ldapscripts/debian/bullseye/patches/sudo-delete-support.patch
similarity index 100%
rename from ldap/ldapscripts/debian/patches/sudo-delete-support.patch
rename to ldap/ldapscripts/debian/bullseye/patches/sudo-delete-support.patch
diff --git a/ldap/ldapscripts/debian/patches/sudo-support.patch b/ldap/ldapscripts/debian/bullseye/patches/sudo-support.patch
similarity index 100%
rename from ldap/ldapscripts/debian/patches/sudo-support.patch
rename to ldap/ldapscripts/debian/bullseye/patches/sudo-support.patch
diff --git a/ldap/openldap/debian/deb_patches/0001-Change-pid-file-and-args-file-location.patch b/ldap/openldap/debian/bullseye/deb_patches/0001-Change-pid-file-and-args-file-location.patch
similarity index 100%
rename from ldap/openldap/debian/deb_patches/0001-Change-pid-file-and-args-file-location.patch
rename to ldap/openldap/debian/bullseye/deb_patches/0001-Change-pid-file-and-args-file-location.patch
diff --git a/ldap/openldap/debian/deb_patches/0002-Support-building-ppolicy-check-password-library.patch b/ldap/openldap/debian/bullseye/deb_patches/0002-Support-building-ppolicy-check-password-library.patch
similarity index 100%
rename from ldap/openldap/debian/deb_patches/0002-Support-building-ppolicy-check-password-library.patch
rename to ldap/openldap/debian/bullseye/deb_patches/0002-Support-building-ppolicy-check-password-library.patch
diff --git a/ldap/openldap/debian/deb_patches/0003-Chg-default-debconf-slapd-no_configuration-to-true.patch b/ldap/openldap/debian/bullseye/deb_patches/0003-Chg-default-debconf-slapd-no_configuration-to-true.patch
similarity index 100%
rename from ldap/openldap/debian/deb_patches/0003-Chg-default-debconf-slapd-no_configuration-to-true.patch
rename to ldap/openldap/debian/bullseye/deb_patches/0003-Chg-default-debconf-slapd-no_configuration-to-true.patch
diff --git a/ldap/openldap/debian/deb_patches/debian-disable-unit-tests.patch b/ldap/openldap/debian/bullseye/deb_patches/debian-disable-unit-tests.patch
similarity index 100%
rename from ldap/openldap/debian/deb_patches/debian-disable-unit-tests.patch
rename to ldap/openldap/debian/bullseye/deb_patches/debian-disable-unit-tests.patch
diff --git a/ldap/openldap/debian/deb_patches/series b/ldap/openldap/debian/bullseye/deb_patches/series
similarity index 100%
rename from ldap/openldap/debian/deb_patches/series
rename to ldap/openldap/debian/bullseye/deb_patches/series
diff --git a/ldap/openldap/debian/files/check_password.conf b/ldap/openldap/debian/bullseye/files/check_password.conf
similarity index 100%
rename from ldap/openldap/debian/files/check_password.conf
rename to ldap/openldap/debian/bullseye/files/check_password.conf
diff --git a/ldap/openldap/debian/meta_data.yaml b/ldap/openldap/debian/bullseye/meta_data.yaml
similarity index 100%
rename from ldap/openldap/debian/meta_data.yaml
rename to ldap/openldap/debian/bullseye/meta_data.yaml
diff --git a/ldap/openldap/debian/patches/rootdn-should-not-bypass-ppolicy.patch b/ldap/openldap/debian/bullseye/patches/rootdn-should-not-bypass-ppolicy.patch
similarity index 100%
rename from ldap/openldap/debian/patches/rootdn-should-not-bypass-ppolicy.patch
rename to ldap/openldap/debian/bullseye/patches/rootdn-should-not-bypass-ppolicy.patch
diff --git a/ldap/openldap/debian/patches/series b/ldap/openldap/debian/bullseye/patches/series
similarity index 100%
rename from ldap/openldap/debian/patches/series
rename to ldap/openldap/debian/bullseye/patches/series