diff --git a/defaults/main.yml b/defaults/main.yml
index 940b3ad..67d29ba 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,8 +1,8 @@
 ---
 DEVICE_IMAGE: zebrunner/mcloud-device
-DEVICE_VERSION: 2.2
+DEVICE_VERSION: 2.2.1
 
 APPIUM_IMAGE: public.ecr.aws/zebrunner/appium
-APPIUM_VERSION: 1.4
+APPIUM_VERSION: 1.4.1
 
 DEVELOPER_IMAGES: {12.0, 12.1, 12.2, 12.3, 12.4, 13.0, 13.1, 13.2, 13.3, 13.4, 13.5, 13.6, 13.7, 14.0, 14.1, 14.2, 14.3, 14.4, 14.5, 14.6, 14.7, 14.8, 15.0, 15.1, 15.2, 15.3, 15.4}
diff --git a/roles/devices/templates/zebrunner-farm b/roles/devices/templates/zebrunner-farm
index 0aef11e..5e7ad2e 100755
--- a/roles/devices/templates/zebrunner-farm
+++ b/roles/devices/templates/zebrunner-farm
@@ -70,7 +70,7 @@ function create_containers () {
 
   if [ $platform_name == "android" ]; then
     docker run -itd --name device-${device_name}-${udid}-appium --network ${net} \
-        --restart on-failure:3 \
+        --restart on-failure \
 	--device=/dev/device-${device_name}-${udid}:/dev/bus/usb/003/011 \
         -v mcloud-key-volume:/root/.android \
 	-v appium-storage-volume:/opt/appium-storage \
@@ -101,7 +101,7 @@ function create_containers () {
         --device=/dev/device-${device_name}-${udid}:/dev/bus/usb/003/011 \
         -e STF_PROVIDER_ADB_HOST=appium \
 	--health-start-period 60s \
-	--restart on-failure:3 \
+	--restart on-failure \
 	-e PLATFORM_NAME=$platform_name \
         -e STF_PROVIDER_DEVICE_NAME="${device_name}" -e DEVICE_UDID="${udid}" \
         -e STF_PROVIDER_HOST={{ STF_PROVIDER_HOST }} \
@@ -120,7 +120,7 @@ function create_containers () {
     # TODO: run our appium container tuned for iOS. Combine later into the single run command
     # candidates for removal: ADB_PORT, STF_PROVIDER_MAX_PORT
     docker run -itd --name device-${device_name}-${udid}-appium --network ${net} \
-        --restart on-failure:3 \
+        --restart on-failure \
 	-v appium-storage-volume:/opt/appium-storage \
 	-v mcloud-storage-volume:/opt/zebrunner \
         -v /var/run/usbmuxd:/var/run/usbmuxd \
@@ -152,7 +152,7 @@ function create_containers () {
 
     #TODO: invetsigate if we need linking with appium container for iOS
     docker run -d --name device-${device_name}-${udid} --log-opt max-size=50m -m 1g --net=${net} \
-        --restart on-failure:3 \
+        --restart on-failure \
         --link device-${device_name}-${udid}-appium:appium \
         -v mcloud-storage-volume:/opt/zebrunner \
         -v /var/run/usbmuxd:/var/run/usbmuxd \