diff --git a/source/server/firstrun.md b/source/server/firstrun.md
index 73cd7e8..b8b4651 100644
--- a/source/server/firstrun.md
+++ b/source/server/firstrun.md
@@ -22,26 +22,28 @@ related:
 Our configuration will use these defaults
 
 ```bash Helpful Variables
-TSM_DB=/srv/sp/database
-TSM_USER=/srv/sp/user
-TSM_DATA=/srv/sp/data
+SP_DB=/srv/sp/database
+SP_USER=/srv/sp/user
+SP_DATA=/srv/sp/data
+SP_IMAGE=ibm/spectrumprotect:8.1.8
 ```
 
-* **TSM_DB** is where the TSM Database will be stored on the Docker Host, and will be passed to the container with `-v $TSM_DB:/database`
-* **TSM_USER** is where the TSM Instance user's home directory is on the Docker Host, and will be passed to the container with `-v $TSM_USER:/tsm`
-* **TSM_DATA** is where the TSM Disk based storage pools are stored on the Docker Host, and will be passed to the container with `-v $TSM_DATA:/data`
+* **SP_DB** is where the TSM Database will be stored on the Docker Host, and will be passed to the container with `-v ${SP_DB}:/database`
+* **SP_USER** is where the TSM Instance user's home directory is on the Docker Host, and will be passed to the container with `-v ${SP_USER}:/tsm`
+* **SP_DATA** is where the TSM Disk based storage pools are stored on the Docker Host, and will be passed to the container with `-v ${SP_DATA}:/data`
  If data is stored in a cloud pool, then this would be where the acceleration pool is holding data before it gets sent to the cloud.
+* **SP_IMAGE** is the name of your docker image (if you followed the instructions on this site it is `ibm/spectrumprotect:8.1.8`
 
 ## First Run Init #1
 
 The first init run will be to create the database layout, and to copy the initialise database (as performed when containerising SP) onto our persistent storage.
 
-`docker run --detach=false --hostname=tsm --interactive=false -v $TSM_USER:/tsm.init -v $TSM_DB:/database.init --privileged=true --rm=true --restart=no --tty=false --name=spectrumprotect ibm/spectrumprotect:8.1.8 init1`
+`docker run --detach=false --hostname=tsm --interactive=false -v ${SP_USER}:/tsm.init -v ${SP_DB}:/database.init --privileged=true --rm=true --restart=no --tty=false --name=spectrumprotect ${SP_IMAGE} init1`
 
-You wont see any output, but if you look in your $TSM_USER path, you should see the familiar TSM instance owner files (like sqllib). The $TSM_DB directory should have sub directories created for the DB2 database, active and archive logs.
+You wont see any output, but if you look in your ${SP_USER} path, you should see the familiar TSM instance owner files (like sqllib). The ${SP_DB} directory should have sub directories created for the DB2 database, active and archive logs.
 
 ```bash Example
-[root@d-1-1 test-sp-server]# ls -aln $TSM_DB
+[root@d-1-1 test-sp-server]# ls -aln ${SP_DB}
 total 0
 drwxr-xr-x 7 201 201 4096 Mar  8 14:30 .
 drwxr-xr-x 5   0   0 4096 Mar  8 14:25 ..
@@ -58,7 +60,7 @@ drwxr-xr-x 2 201 201 4096 Mar  8 14:30 tsmdb
 
 The second init run will now run the post-install setup for a new environment (`dsmserv formatdb` and then create the ADMIN user - using the macro file added during the build).
 
-`docker run --detach=false --hostname=tsm --interactive=false -v $TSM_USER:/tsm -v $TSM_DB:/database --privileged=true --rm=true --restart=no --tty=false --name=spectrumprotect ibm/spectrumprotect:8.1.8 init2`
+`docker run --detach=false --hostname=tsm --interactive=false -v ${SP_USER}:/tsm -v ${SP_DB}:/database --privileged=true --rm=true --restart=no --tty=false --name=spectrumprotect ${SP_IMAGE} init2`
 
 ```tsm Expected Output
 ANR7800I DSMSERV generated at 00:18:30 on Feb  5 2019.
diff --git a/source/server/normalrun.md b/source/server/normalrun.md
index 144a337..e4badde 100644
--- a/source/server/normalrun.md
+++ b/source/server/normalrun.md
@@ -10,7 +10,7 @@ related:
 - { page: "recover", title: "Recovering the SP Database" }
 ---
 # Normal Run of a Spectrum Protect Server (in a container)
-*Updated for Spectrum Protect 8.1.7!*
+*Updated for Spectrum Protect 8.1.8!*
 
 > **NOTES**:
 > * The storage used in the example below is from the host file systems, passed to the container with Docker's `-v` option.
@@ -21,21 +21,23 @@ related:
 Our configuration will use these defaults
 
 ```bash Helpful Variables
-TSM_DB=/srv/sp/database
-TSM_USER=/srv/sp/user
-TSM_DATA=/srv/sp/data
+SP_DB=/srv/sp/database
+SP_USER=/srv/sp/user
+SP_DATA=/srv/sp/data
+SP_IMAGE=ibm/spectrumprotect:8.1.8
 ```
 
-* **TSM_DB** is where the TSM Database will be stored on the Docker Host, and will be passed to the container with `-v $TSM_DB:/database`
-* **TSM_USER** is where the TSM Instance user's home directory is on the Docker Host, and will be passed to the container with `-v $TSM_USER:/tsm`
-* **TSM_DATA** is where the TSM Disk based storage pools are stored on the Docker Host, and will be passed to the container with `-v $TSM_DATA:/data`
+* **SP_DB** is where the TSM Database will be stored on the Docker Host, and will be passed to the container with `-v ${SP_DB}:/database`
+* **SP_USER** is where the TSM Instance user's home directory is on the Docker Host, and will be passed to the container with `-v ${SP_USER}:/tsm`
+* **SP_DATA** is where the TSM Disk based storage pools are stored on the Docker Host, and will be passed to the container with `-v ${SP_DATA}:/data`
  If data is stored in a cloud pool, then this would be where the acceleration pool is holding data before it gets sent to the cloud.
+* **SP_IMAGE** is the name of your docker image (if you followed the instructions on this site it is `ibm/spectrumprotect:8.1.8`
 
 # Normal Run
 
 Starting SP for normal operations.
 
-`docker run --detach=true --hostname=tsm --interactive=false -v $TSM_USER:/tsm -v $TSM_DB:/database -v $TSM_DATA:/data --memory=16g -p 1500:1500 -p 1543:1543 --privileged=true --rm=false --restart=no --tty=false --name=spectrumprotect ibm/spectrumprotect:8.1.7`
+`docker run --detach=true --hostname=tsm --interactive=false -v ${SP_USER}:/tsm -v ${SP_DB}:/database -v ${SP_DATA}:/data --memory=16g -p 1500:1500 -p 1543:1543 --privileged=true --rm=false --restart=no --tty=false --stop-timeout=300 --name=spectrumprotect ${SP_IMAGE}`
 
 ```tsm Expected Startup, viewable by doing docker log -f spectrumprotect
 ANR7800I DSMSERV generated at 00:18:30 on Feb  5 2019.
diff --git a/source/server/upgrade.md b/source/server/upgrade.md
index 8da844a..79d65b9 100644
--- a/source/server/upgrade.md
+++ b/source/server/upgrade.md
@@ -10,7 +10,6 @@ related:
 - { page: "recover", title: "Recovering the SP Database" }
 ---
 # Upgrading Spectrum Protect Server (in a container)
-*Updated for Spectrum Protect 8.1.7!*
 
 > **NOTES**:
 > * The storage used in the example below is from the host file systems, passed to the container with Docker's `-v` option.
@@ -24,15 +23,17 @@ related:
 Our configuration will use these defaults
 
 ```bash Helpful Variables
-TSM_DB=/srv/sp/database
-TSM_USER=/srv/sp/user
-TSM_DATA=/srv/sp/data
+SP_DB=/srv/sp/database
+SP_USER=/srv/sp/user
+SP_DATA=/srv/sp/data
+SP_IMAGE=ibm/spectrumprotect:8.1.7
 ```
 
-* **TSM_DB** is where the TSM Database will be stored on the Docker Host, and will be passed to the container with `-v $TSM_DB:/database`
-* **TSM_USER** is where the TSM Instance user's home directory is on the Docker Host, and will be passed to the container with `-v $TSM_USER:/tsm`
-* **TSM_DATA** is where the TSM Disk based storage pools are stored on the Docker Host, and will be passed to the container with `-v $TSM_DATA:/data`
+* **SP_DB** is where the TSM Database will be stored on the Docker Host, and will be passed to the container with `-v ${SP_DB}:/database`
+* **SP_USER** is where the TSM Instance user's home directory is on the Docker Host, and will be passed to the container with `-v ${SP_USER}:/tsm`
+* **SP_DATA** is where the TSM Disk based storage pools are stored on the Docker Host, and will be passed to the container with `-v ${SP_DATA}:/data`
  If data is stored in a cloud pool, then this would be where the acceleration pool is holding data before it gets sent to the cloud.
+* **SP_IMAGE** is the name of your docker image (if you followed the instructions on this site it is `ibm/spectrumprotect:8.1.7`
 
 # Upgrade Steps
 
@@ -63,7 +64,7 @@ Protect: SERVER1>q volh type=dbb
 Make sure your backup is successful and make a note of where it is, in case you need it.
 
 ```bash On the Host
-[root@host]# ls -aln $TSM_DATA/dbb/|grep 20999284
+[root@host]# ls -aln ${SP_DATA}/dbb/|grep 20999284
 -rw------- 1 201 201 2215642514 Mar 14 14:51 20999284.dbv
 ```
 ## Stop Spectrum Protect
@@ -108,7 +109,7 @@ Filesystem                   1K-blocks     Used Available Use% Mounted on
 
 ### You need to do a one-time start of the container with the option `upgrade`.
 
-`docker run --detach=true --hostname=tsm --interactive=false -v $TSM_USER:/tsm -v $TSM_DB:/database --privileged=true --rm=false --tty=false --name=spectrumprotect ibm/spectrumprotect:8.1.7 upgrade`
+`docker run --detach=true --hostname=tsm --interactive=false -v ${SP_USER}:/tsm -v ${SP_DB}:/database --privileged=true --rm=false --tty=false --name=spectrumprotect ${SP_IMAGE} upgrade`
 
 <small>**NOTE**: You can see the console by running `docker logs -f spectrumprotect` to make sure the upgrade works as expected. Once you see success, you can delete the container with `docker rm -v spectrumprotect`.</small>
 
@@ -136,7 +137,7 @@ DBI1070I  Program db2iupdt completed successfully.
 ### Normal Run
 Spectrum Protect is ready to run on the new version as normal. The first time it runs at a later release, you should see some `ANR0276I` messages.
 
-`docker run --detach=true --hostname=tsm --interactive=false -v $TSM_USER:/tsm -v $TSM_DB:/database -v $TSM_DATA:/data --memory=16g -p 1500:1500 -p 1543:1543 --privileged=true --rm=false --restart=no --tty=false --name=spectrumprotect ibm/spectrumprotect:8.1.7`
+`docker run --detach=true --hostname=tsm --interactive=false -v ${SP_USER}:/tsm -v ${SP_DB}:/database -v ${SP_DATA}:/data --memory=16g -p 1500:1500 -p 1543:1543 --privileged=true --rm=false --restart=no --tty=false --stop-timeout=300 --name=spectrumprotect ${SP_IMAGE}`
 
 ```plain Expected Output
 ANR7800I DSMSERV generated at 00:18:30 on Feb  5 2019.