diff --git a/getting_started/topics/first-boot/boot.adoc b/getting_started/topics/first-boot/boot.adoc
index ed15997828..3f8d7f1524 100644
--- a/getting_started/topics/first-boot/boot.adoc
+++ b/getting_started/topics/first-boot/boot.adoc
@@ -4,13 +4,13 @@
 To boot the {project_name} server, go to the `bin` directory of the server distribution and run the `standalone` boot script:
 
 .Linux/Unix
-[source]
+[source,bash,subs=+attributes]
 ----
 $ .../bin/standalone.sh
 ----
 
 .Windows
-[source]
+[source,bash,subs=+attributes]
 ----
 > ...\bin\standalone.bat
 ----
diff --git a/getting_started/topics/first-boot/distribution-files-community.adoc b/getting_started/topics/first-boot/distribution-files-community.adoc
index e521887b88..b5f130f8e1 100644
--- a/getting_started/topics/first-boot/distribution-files-community.adoc
+++ b/getting_started/topics/first-boot/distribution-files-community.adoc
@@ -22,7 +22,7 @@ $ tar -xvzf keycloak-{project_version}.tar.gz
 ----
 
 .Windows
-[source]
+[source,bash,subs=+attributes]
 ----
 > unzip keycloak-{project_version}.zip
 ----
\ No newline at end of file
diff --git a/getting_started/topics/first-boot/distribution-files-product.adoc b/getting_started/topics/first-boot/distribution-files-product.adoc
index 059a325884..35054f6afa 100644
--- a/getting_started/topics/first-boot/distribution-files-product.adoc
+++ b/getting_started/topics/first-boot/distribution-files-product.adoc
@@ -12,13 +12,13 @@ The *rh-sso-{project_version}.GA.zip* file is the server-only distribution. It c
 Place the file in a directory you choose and use the `unzip` utility to unpack it, like this:
 
 .Linux/Unix
-[source]
+[source,bash,subs=+attributes]
 ----
 $ unzip rh-sso-{project_version}.GA.zip
 ----
 
 .Windows
-[source]
+[source,bash,subs=+attributes]
 ----
 > unzip rh-sso-{project_version}.GA.zip
 ----
diff --git a/getting_started/topics/secure-jboss-app/before.adoc b/getting_started/topics/secure-jboss-app/before.adoc
index 6f7e09ffce..73656ff1a8 100644
--- a/getting_started/topics/secure-jboss-app/before.adoc
+++ b/getting_started/topics/secure-jboss-app/before.adoc
@@ -10,13 +10,13 @@ To adjust the port used, change the value of the `jboss.socket.binding.port-offs
 To start the {project_name} server while also adjusting the port:
 
 .Linux/Unix
-[source]
+[source,bash,subs=+attributes]
 ----
 $ .../bin/standalone.sh -Djboss.socket.binding.port-offset=100
 ----
 
 .Windows
-[source]
+[source,bash,subs=+attributes]
 ----
 > ...\bin\standalone.bat -Djboss.socket.binding.port-offset=100
 ----
diff --git a/getting_started/topics/secure-jboss-app/install-client-adapter.adoc b/getting_started/topics/secure-jboss-app/install-client-adapter.adoc
index 57a38563d4..36d12ffea8 100644
--- a/getting_started/topics/secure-jboss-app/install-client-adapter.adoc
+++ b/getting_started/topics/secure-jboss-app/install-client-adapter.adoc
@@ -16,29 +16,29 @@ Extract the contents of this file into the root directory of your {appserver_nam
 Run the appropriate script for your platform:
 
 .WildFly 10 and Linux/Unix
-[source]
+[source,bash,subs=+attributes]
 ----
 $ cd bin
 $ ./jboss-cli.sh --file=adapter-install-offline.cli
 ----
 
 .WildFly 10 and Windows
-[source]
+[source,bash,subs=+attributes]
 ----
 > cd bin
 > jboss-cli.bat --file=adapter-install-offline.cli
 ----
 
 ifeval::[{project_community}==true]
-.WildFly 11 and Linux/Unix
-[source]
+.Wildfly 11 and Linux/Unix
+[source,bash,subs=+attributes]
 ----
 $ cd bin
 $ ./jboss-cli.sh --file=adapter-elytron-install-offline.cli
 ----
 
-.WildFly 11 and Windows
-[source]
+.Wildfly 11 and Windows
+[source,bash,subs=+attributes]
 ----
 > cd bin
 > jboss-cli.bat --file=adapter-elytron-install-offline.cli
@@ -50,13 +50,13 @@ NOTE: This script will make the necessary edits to the `.../standalone/configura
 Start the application server.
 
 .Linux/Unix
-[source]
+[source,bash,subs=+attributes]
 ----
 $ .../bin/standalone.sh
 ----
 
 .Windows
-[source]
+[source,bash,subs=+attributes]
 ----
 > ...\bin\standalone.bat
 ----