diff --git a/moon-local.yaml b/moon-local.yaml
index bd5e1d1..72dbdda 100644
--- a/moon-local.yaml
+++ b/moon-local.yaml
@@ -106,7 +106,7 @@ spec:
       serviceAccountName: moon
       containers:
       - name: moon
-        image: aerokube/moon:1.9.4
+        image: aerokube/moon:1.9.5
         args: ["-namespace", "moon", "-license-file", "/license/license.key", "-disable-cpu-limits", "-disable-memory-limits", "-service-account-name", "moon"]
         ports:
         - containerPort: 4444
@@ -127,7 +127,7 @@ spec:
           mountPath: /license
           readOnly: true
       - name: moon-api
-        image: aerokube/moon-api:1.9.4
+        image: aerokube/moon-api:1.9.5
         args: ["-namespace", "moon", "-license-file", "/license/license.key", "-listen", ":8888"]
         ports:
         - containerPort: 8888
@@ -668,8 +668,13 @@ data:
         }
       },
       "MicrosoftEdge": {
-        "default": "96.0",
+        "default": "97.0",
         "versions": {
+          "97.0": {
+            "image": "quay.io/browsers/edge:97.0",
+            "port": "4444",
+            "path": "/"
+          },
           "96.0": {
             "image": "quay.io/browsers/edge:96.0",
             "port": "4444",
@@ -718,8 +723,13 @@ data:
         }
       },
       "firefox": {
-        "default": "95.0",
+        "default": "96.0",
         "versions": {
+          "96.0": {
+            "image": "quay.io/browsers/firefox:96.0",
+            "port": "4444",
+            "path": "/wd/hub"
+          },
           "95.0": {
             "image": "quay.io/browsers/firefox:95.0",
             "port": "4444",
@@ -1188,8 +1198,12 @@ data:
         }
       },
       "chrome": {
-        "default": "96.0",
+        "default": "97.0",
         "versions": {
+          "97.0": {
+            "image": "quay.io/browsers/chrome:97.0",
+            "port": "4444"
+          },
           "96.0": {
             "image": "quay.io/browsers/chrome:96.0",
             "port": "4444"
@@ -1385,8 +1399,12 @@ data:
         }
       },
       "opera": {
-        "default": "82.0",
+        "default": "83.0",
         "versions": {
+          "83.0": {
+            "image": "quay.io/browsers/opera:83.0",
+            "port": "4444"
+          },
           "82.0": {
             "image": "quay.io/browsers/opera:82.0",
             "port": "4444"
diff --git a/moon-monitor.yaml b/moon-monitor.yaml
index e6948d7..f4c3119 100644
--- a/moon-monitor.yaml
+++ b/moon-monitor.yaml
@@ -89,7 +89,7 @@ spec:
       serviceAccountName: moon-monitor
       containers:
         - name: moon-monitor
-          image: aerokube/moon-monitor:1.9.4
+          image: aerokube/moon-monitor:1.9.5
           args:
             - -namespace # -namespace flag specifies namespace where Moon is running
             - moon
diff --git a/moon-openshift.yaml b/moon-openshift.yaml
index 4599868..d51325d 100644
--- a/moon-openshift.yaml
+++ b/moon-openshift.yaml
@@ -742,8 +742,13 @@ objects:
             }
           },
           "MicrosoftEdge": {
-            "default": "96.0",
+            "default": "97.0",
             "versions": {
+              "97.0": {
+                "image": "quay.io/browsers/edge:97.0",
+                "port": "4444",
+                "path": "/"
+              },
               "96.0": {
                 "image": "quay.io/browsers/edge:96.0",
                 "port": "4444",
@@ -792,8 +797,13 @@ objects:
             }
           },
           "firefox": {
-            "default": "95.0",
+            "default": "96.0",
             "versions": {
+              "96.0": {
+                "image": "quay.io/browsers/firefox:96.0",
+                "port": "4444",
+                "path": "/wd/hub"
+              },
               "95.0": {
                 "image": "quay.io/browsers/firefox:95.0",
                 "port": "4444",
@@ -1257,8 +1267,12 @@ objects:
             }
           },
           "chrome": {
-            "default": "96.0",
+            "default": "97.0",
             "versions": {
+              "97.0": {
+                "image": "quay.io/browsers/chrome:97.0",
+                "port": "4444"
+              },
               "96.0": {
                 "image": "quay.io/browsers/chrome:96.0",
                 "port": "4444"
@@ -1454,8 +1468,12 @@ objects:
             }
           },
           "opera": {
-            "default": "82.0",
+            "default": "83.0",
             "versions": {
+              "83.0": {
+                "image": "quay.io/browsers/opera:83.0",
+                "port": "4444"
+              },
               "82.0": {
                 "image": "quay.io/browsers/opera:82.0",
                 "port": "4444"
@@ -1682,13 +1700,13 @@ parameters:
 - name: MOON_IMAGE
   displayName: Moon docker image
   description: Name of the image to be used.
-  value: quay.io/aerokube/moon:1.9.4
+  value: quay.io/aerokube/moon:1.9.5
   required: true
 
 - name: MOON_API_IMAGE
   displayName: Moon-API docker image
   description: Name of the image to be used.
-  value: quay.io/aerokube/moon-api:1.9.4
+  value: quay.io/aerokube/moon-api:1.9.5
   required: true
 
 - name: MOON_UI_IMAGE
diff --git a/moon.yaml b/moon.yaml
index c198aec..d33a137 100644
--- a/moon.yaml
+++ b/moon.yaml
@@ -139,7 +139,7 @@ spec:
     spec:
       containers:
       - name: moon
-        image: aerokube/moon:1.9.4
+        image: aerokube/moon:1.9.5
         args: ["-namespace", "moon", "-license-file", "/license/license.key"]
         resources:
           limits:
@@ -167,7 +167,7 @@ spec:
           mountPath: /license
           readOnly: true
       - name: moon-api
-        image: aerokube/moon-api:1.9.4
+        image: aerokube/moon-api:1.9.5
         args: ["-namespace", "moon", "-license-file", "/license/license.key", "-listen", ":8888"]
         resources:
           limits:
@@ -723,8 +723,13 @@ data:
         }
       },
       "MicrosoftEdge": {
-        "default": "96.0",
+        "default": "97.0",
         "versions": {
+          "97.0": {
+            "image": "quay.io/browsers/edge:97.0",
+            "port": "4444",
+            "path": "/"
+          },
           "96.0": {
             "image": "quay.io/browsers/edge:96.0",
             "port": "4444",
@@ -773,8 +778,13 @@ data:
         }
       },
       "firefox": {
-        "default": "95.0",
+        "default": "96.0",
         "versions": {
+          "96.0": {
+            "image": "quay.io/browsers/firefox:96.0",
+            "port": "4444",
+            "path": "/wd/hub"
+          },
           "95.0": {
             "image": "quay.io/browsers/firefox:95.0",
             "port": "4444",
@@ -1243,8 +1253,12 @@ data:
         }
       },
       "chrome": {
-        "default": "96.0",
+        "default": "97.0",
         "versions": {
+          "97.0": {
+            "image": "quay.io/browsers/chrome:97.0",
+            "port": "4444"
+          },
           "96.0": {
             "image": "quay.io/browsers/chrome:96.0",
             "port": "4444"
@@ -1440,8 +1454,12 @@ data:
         }
       },
       "opera": {
-        "default": "82.0",
+        "default": "83.0",
         "versions": {
+          "83.0": {
+            "image": "quay.io/browsers/opera:83.0",
+            "port": "4444"
+          },
           "82.0": {
             "image": "quay.io/browsers/opera:82.0",
             "port": "4444"