diff --git a/Gemfile b/Gemfile
index 92ce6f94511..039f9d01c19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'asciidoctor'
+gem 'asciidoctor-tabs'
 gem 'sass'
 
 # For TOC generation
diff --git a/guides/common/Makefile b/guides/common/Makefile
index 722fb58ffbd..8f698d7b99d 100644
--- a/guides/common/Makefile
+++ b/guides/common/Makefile
@@ -75,7 +75,7 @@ $(IMAGES_TS): $(IMAGES)
 	@touch $(IMAGES_TS)
 
 $(DEST_HTML): $(SOURCES) $(DEPENDENCIES) $(DOCINFO_SOURCES) $(DEST_DIR)/$(BUILD).css $(IMAGES_TS)
-	bundle exec asciidoctor -a build=$(BUILD) $(BASEURL_ATTR) -a docinfo=shared -a docinfodir=common -a date_mdy="$(DATE_MDY)" -a date_my="$(DATE_MY)" -a docdatetime="$(DATE_MY)" -a stylesheet=$(DEST_DIR)/$(BUILD).css -a attribute-missing=warn -b html5 -d book --trace -o $@ $< 2>&1 | tee $@.log 1>&2
+	bundle exec asciidoctor -r asciidoctor-tabs -a build=$(BUILD) $(BASEURL_ATTR) -a docinfo=shared -a docinfodir=common -a date_mdy="$(DATE_MDY)" -a date_my="$(DATE_MY)" -a docdatetime="$(DATE_MY)" -a stylesheet=$(DEST_DIR)/$(BUILD).css -a attribute-missing=warn -b html5 -d book --trace -o $@ $< 2>&1 | tee $@.log 1>&2
 	@echo CHECKING FOR ASCIIDOCTOR ERRORS AND WARNINGS
 	@! grep -Eq "^asciidoctor: (ERROR|WARNING)" $@.log
 	@echo CHECKING FOR ORPHAN XREFS HTML LINKS
diff --git a/guides/common/modules/proc_configuring-repositories.adoc b/guides/common/modules/proc_configuring-repositories.adoc
index 2afe20f3a64..1ae838cd1ec 100644
--- a/guides/common/modules/proc_configuring-repositories.adoc
+++ b/guides/common/modules/proc_configuring-repositories.adoc
@@ -7,23 +7,13 @@ endif::[]
 
 ifndef::orcharhino[]
 .Procedure
-Select the operating system and version you are installing on:
 endif::[]
 
 ifdef::foreman-el,katello,satellite[]
-* xref:#repositories-el-9[{EL} 9]
-* xref:#repositories-el-8[{EL} 8]
-endif::[]
-ifdef::foreman-deb[]
-* xref:#repositories-debian-11[Debian 11 (Bullseye)]
-* xref:#repositories-ubuntu-2004[Ubuntu 20.04 (Focal)]
-* xref:#repositories-ubuntu-2204[Ubuntu 22.04 (Jammy)]
-endif::[]
-
-ifdef::foreman-el,katello,satellite[]
-[id="repositories-el-9"]
-== {EL} 9
-
+[tabs]
+=====
+{EL} 9::
++
 ifdef::satellite[]
 . Disable all repositories:
 +
@@ -51,11 +41,8 @@ ifdef::foreman-el,katello[]
 include::proc_configuring-repositories-el.adoc[]
 endif::[]
 
-include::snip_verification-enabled-repolist.adoc[]
-
-[id="repositories-el-8"]
-== {EL} 8
-
+{EL} 8::
++
 ifdef::satellite[]
 . Disable all repositories:
 +
@@ -103,26 +90,33 @@ ifeval::["{context}" != "{project-context}"]
 endif::[]
 For more information about modules and lifecycle streams on {RHEL} 8, see https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle[{RHEL} Application Streams Lifecycle].
 ====
+=====
 
 include::snip_verification-enabled-repolist.adoc[]
 endif::[]
 
 ifdef::foreman-deb[]
-[id="repositories-debian-11"]
-== Debian 11 (Bullseye)
-
+[tabs]
+=====
+Debian 11 (Bullseye)::
++
+--
 :distribution-codename: bullseye
 include::proc_configuring-repositories-deb.adoc[]
+--
 
-[id="repositories-ubuntu-2004"]
-== Ubuntu 20.04 (Focal)
-
+Ubuntu 20.04 (Focal)::
++
+--
 :distribution-codename: focal
 include::proc_configuring-repositories-deb.adoc[]
+--
 
-[id="repositories-ubuntu-2204"]
-== Ubuntu 22.04 (Jammy)
-
+Ubuntu 22.04 (Jammy)::
++
+--
 :distribution-codename: jammy
 include::proc_configuring-repositories-deb.adoc[]
+--
+=====
 endif::[]