diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index d8bcb0e0dd4d..31373309dcd3 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -2507,6 +2507,9 @@ boolean isLeap() {
     boolean isLeap15() {
         return ServerConstants.LEAP.equalsIgnoreCase(getOs()) && getRelease().startsWith("15");
     }
+    boolean isLeap16() {
+        return ServerConstants.LEAP.equalsIgnoreCase(getOs()) && getRelease().startsWith("16");
+    }
 
     /**
      * @return true if the installer type is of openSUSE Leap Micro
diff --git a/java/spacewalk-java.changes.juliogonzalez.leap16.0 b/java/spacewalk-java.changes.juliogonzalez.leap16.0
new file mode 100644
index 000000000000..7820b1a447c2
--- /dev/null
+++ b/java/spacewalk-java.changes.juliogonzalez.leap16.0
@@ -0,0 +1 @@
+- Add product identification for openSUSE Leap 16.0 (Alpha)
diff --git a/schema/spacewalk/susemanager-schema.changes.juliogonzalez.leap16.0 b/schema/spacewalk/susemanager-schema.changes.juliogonzalez.leap16.0
new file mode 100644
index 000000000000..b613e320103e
--- /dev/null
+++ b/schema/spacewalk/susemanager-schema.changes.juliogonzalez.leap16.0
@@ -0,0 +1 @@
+- Add GPG key for SLFO packages
diff --git a/schema/spacewalk/upgrade/susemanager-schema-5.1.1-to-susemanager-schema-5.1.2/001-add-slfo-package-keys.sql b/schema/spacewalk/upgrade/susemanager-schema-5.1.1-to-susemanager-schema-5.1.2/001-add-slfo-package-keys.sql
new file mode 100644
index 000000000000..3c8ec36ee98d
--- /dev/null
+++ b/schema/spacewalk/upgrade/susemanager-schema-5.1.1-to-susemanager-schema-5.1.2/001-add-slfo-package-keys.sql
@@ -0,0 +1 @@
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) (select sequence_nextval('rhn_pkey_id_seq'), 'fec28eaf09d9ea69', lookup_package_key_type('gpg'), lookup_package_provider('SUSE LLC') from dual where not exists (select 1 from rhnPackageKey where key_id = 'fec28eaf09d9ea69'));
diff --git a/susemanager/src/mgr_bootstrap_data.py b/susemanager/src/mgr_bootstrap_data.py
index f8c6fe167b1c..6aef6cd28cfe 100644
--- a/susemanager/src/mgr_bootstrap_data.py
+++ b/susemanager/src/mgr_bootstrap_data.py
@@ -1512,6 +1512,26 @@
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/15/6/bootstrap/",
     },
+    "openSUSE-Leap-16.0-x86_64-uyuni": {
+        "BASECHANNEL": "opensuse_leap16_0-x86_64",
+        "PKGLIST": PKGLISTMICRO_BUNDLE_ONLY,
+        "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/16/0/bootstrap/",
+    },
+    "openSUSE-Leap-16.0-aarch64-uyuni": {
+        "BASECHANNEL": "opensuse_leap16_0-aarch64",
+        "PKGLIST": PKGLISTMICRO_BUNDLE_ONLY,
+        "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/16/0/bootstrap/",
+    },
+    "openSUSE-Leap-16.0-s390x-uyuni": {
+        "BASECHANNEL": "opensuse_leap16_0-s390x",
+        "PKGLIST": PKGLISTMICRO_BUNDLE_ONLY,
+        "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/16/0/bootstrap/",
+    },
+    "openSUSE-Leap-16.0-ppc64le-uyuni": {
+        "BASECHANNEL": "opensuse_leap16_0-ppc64le",
+        "PKGLIST": PKGLISTMICRO_BUNDLE_ONLY,
+        "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/16/0/bootstrap/",
+    },
     "openSUSE-Leap-Micro-5.3-x86_64-uyuni": {
         "BASECHANNEL": "opensuse_micro5_3-x86_64",
         "PKGLIST": PKGLISTMICRO_BUNDLE_ONLY,
diff --git a/susemanager/susemanager.changes.juliogonzalez.leap16.0 b/susemanager/susemanager.changes.juliogonzalez.leap16.0
new file mode 100644
index 000000000000..762c66af936b
--- /dev/null
+++ b/susemanager/susemanager.changes.juliogonzalez.leap16.0
@@ -0,0 +1 @@
+- Add openSUSE Leap 16.0 (Alpha) bootstrap repositories
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 5abba420743f..7e292449bf25 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -1328,6 +1328,38 @@ gpgkey_id = %(_uyuni_gpgkey_id)s
 gpgkey_fingerprint = %(_uyuni_gpgkey_fingerprint)s
 repo_url = https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/openSUSE_Leap_15-Uyuni-Client-Tools/openSUSE_Leap_15.0/
 
+[opensuse_leap16_0]
+checksum = sha256
+archs    = x86_64, aarch64, s390x, ppc6le
+name     = openSUSE Leap 16.0 (%(arch)s)
+gpgkey_url = file:///usr/lib/rpm/gnupg/keys/gpg-pubkey-29b700a4-62b07e22.asc
+gpgkey_id = 29B700A4
+gpgkey_fingerprint = AD48 5664 E901 B867 051A B15F 35A2 F86E 29B7 00A4
+repo_url = https://cdn.opensuse.org/distribution/leap/16.0/repo/oss/
+dist_map_release = 16.0
+
+# This is expected. openSUSE Leap 16.0 client tools are valid for all openSUSE Leap 16.X releases
+[opensuse_leap16_0-uyuni-client]
+name     = Uyuni Client Tools for %(base_channel_name)s
+archs    = x86_64, aarch64, s390x, ppc6le
+base_channels = opensuse_leap16_0-%(arch)s
+checksum = sha256
+gpgkey_url = %(_uyuni_gpgkey_url)s
+gpgkey_id = %(_uyuni_gpgkey_id)s
+gpgkey_fingerprint = %(_uyuni_gpgkey_fingerprint)s
+repo_url = https://cdn.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/SLMicro6-Uyuni-Client-Tools/SL-Micro6/
+
+# This is expected. openSUSE Leap 16.0 client tools are valid for all openSUSE Leap 16.X releases
+[opensuse_leap16_0-uyuni-client-devel]
+name     = Uyuni Client Tools for %(base_channel_name)s (Development)
+archs    = x86_64, aarch64, s390x, ppc6le
+base_channels = opensuse_leap16_0-%(arch)s
+checksum = sha256
+gpgkey_url = %(_uyuni_gpgkey_url)s
+gpgkey_id = %(_uyuni_gpgkey_id)s
+gpgkey_fingerprint = %(_uyuni_gpgkey_fingerprint)s
+repo_url = https://cdn.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/SLMicro6-Uyuni-Client-Tools/SL-Micro6/
+
 [opensuse_micro5_3]
 checksum = sha256
 archs    = x86_64, aarch64
diff --git a/utils/spacewalk-utils.changes.juliogonzalez.leap16.0 b/utils/spacewalk-utils.changes.juliogonzalez.leap16.0
new file mode 100644
index 000000000000..00c529876b2b
--- /dev/null
+++ b/utils/spacewalk-utils.changes.juliogonzalez.leap16.0
@@ -0,0 +1 @@
+- Add openSUSE Leap 16.0 (Alpha) repositories