diff --git a/.tugboat/config.yml b/.tugboat/config.yml
index 424176f5459fd366e359f1ead54c7b2d45716aa0..9f4d4d959cea8eca67a540b4fc1570f39850cc76 100644
--- a/.tugboat/config.yml
+++ b/.tugboat/config.yml
@@ -1,7 +1,7 @@
 services:
   php:
     # Specify the version of Drupal you wish to use for Tugboat below.
-    image: q0rban/tugboat-drupal:10
+    image: q0rban/tugboat-drupal:11
     default: true
     http: false
     depends: mysql
@@ -23,9 +23,9 @@ services:
         # Now we can require this module, specifing the branch name we created
         # above that uses the $TUGBOAT_REPO_ID environment variable.
         composer require drupal/environment_indicator:dev-$TUGBOAT_REPO_ID
-        composer require 'drupal/gin_toolbar:^1.0@RC'
-        composer require 'drupal/gin:^3.0@RC'
-        composer require 'drupal/admin_toolbar:^3.0@RC'
+        composer require 'drupal/gin_toolbar'
+        composer require 'drupal/gin'
+        composer require 'drupal/admin_toolbar'
         # Install Drupal on the site.
         vendor/bin/drush \
           --yes \
diff --git a/composer.json b/composer.json
index 40404f6f0cef2aa6602c2829df005d787f6c0adb..9c369058d4d82ee1989d976501eb66a0be5b4050 100644
--- a/composer.json
+++ b/composer.json
@@ -33,8 +33,8 @@
     },
     "require": {},
     "require-dev": {
-        "drupal/gin": "^4.0",
-        "drupal/gin_toolbar": "^2.0",
+        "drupal/gin": "^4.0 || ^5.0",
+        "drupal/gin_toolbar": "^2.0 || ^3.0",
         "drupal/admin_toolbar": "^3.0"
     }
 }
diff --git a/modules/environment_indicator_toolbar/css/gin-toolbar-vertical.css b/modules/environment_indicator_toolbar/css/gin-toolbar-vertical.css
index 965c0d622072dc9b51155659b81418026e50ece9..82dc50aadeaff45d80def749aa24048cd207c534 100644
--- a/modules/environment_indicator_toolbar/css/gin-toolbar-vertical.css
+++ b/modules/environment_indicator_toolbar/css/gin-toolbar-vertical.css
@@ -32,12 +32,8 @@ nav[data-environment-indicator-gin-vertical] .toolbar-menu-administration {
     > .menu-item
     .toolbar-menu {
     margin-inline-start: calc(
-      /* stylelint-disable custom-property-pattern */
-        /* See https://www.drupal.org/i/3309113 */
-        /* See https://www.drupal.org/i/3524015 */
-        var(--gin-toolbar-width-collapsed, var(--ginToolbarWidthCollapsed)) -
+      var(--gin-toolbar-width-collapsed) -
         var(--environment-indicator-border-width)
-        /* stylelint-enable custom-property-pattern */
     );
   }
 
@@ -47,12 +43,7 @@ nav[data-environment-indicator-gin-vertical] .toolbar-menu-administration {
     > .menu-item
     .toolbar-menu {
     margin-inline-start: calc(
-      /* stylelint-disable custom-property-pattern */
-        /* See https://www.drupal.org/i/3309113 */
-        /* See https://www.drupal.org/i/3524015 */
-        var(--gin-toolbar-width, var(--ginToolbarWidth)) -
-        var(--environment-indicator-border-width)
-        /* stylelint-enable custom-property-pattern */
+      var(--gin-toolbar-width) - var(--environment-indicator-border-width)
     );
   }
 }
diff --git a/modules/environment_indicator_toolbar/css/toolbar.css b/modules/environment_indicator_toolbar/css/toolbar.css
index d5e2618851753c698d0615b8949f6a675148315e..93add4511f74fcc97b7ba268da54cc25d7dcba7a 100644
--- a/modules/environment_indicator_toolbar/css/toolbar.css
+++ b/modules/environment_indicator_toolbar/css/toolbar.css
@@ -35,23 +35,11 @@ nav[data-environment-indicator].toolbar-bar .toolbar-icon-environment::before {
   background-image: url("../images/env-bebebe.svg");
 }
 
-.no-svg
-  nav[data-environment-indicator].toolbar-bar
-  .toolbar-icon-environment::before {
-  background-image: url("../images/env-bebebe.png");
-}
-
 nav[data-environment-indicator].toolbar-bar
   .toolbar-icon-environment.is-active::before {
   background-image: url("../images/env-ffffff.svg");
 }
 
-.no-svg
-  nav[data-environment-indicator].toolbar-bar
-  .toolbar-icon-environment.is-active::before {
-  background-image: url("../images/env-ffffff.png");
-}
-
 .toolbar
   nav[data-environment-indicator]
   .toolbar-tray-vertical
diff --git a/modules/environment_indicator_toolbar/images/env-bebebe.png b/modules/environment_indicator_toolbar/images/env-bebebe.png
deleted file mode 100644
index 751d0d1c64b517af6262ea3b1ab3fafc1f587734..0000000000000000000000000000000000000000
--- a/modules/environment_indicator_toolbar/images/env-bebebe.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-   IHDR         ��a   tEXtSoftware Adobe ImageReadyq�e<   4IDATx�b`�0�߷�?%0A�@ n��  �'� (]�0P`4Gqp"@� gڙX[)    IEND�B`�
\ No newline at end of file
diff --git a/modules/environment_indicator_toolbar/images/env-ffffff.png b/modules/environment_indicator_toolbar/images/env-ffffff.png
deleted file mode 100644
index b93056379c64780351a1852f4ffeffd0834a28f0..0000000000000000000000000000000000000000
--- a/modules/environment_indicator_toolbar/images/env-ffffff.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-   IHDR         ��a   tEXtSoftware Adobe ImageReadyq�e<   ,IDATx�b`�0�J`�ҁ@�H�@�? ^`��@�` H�����    IEND�B`�
\ No newline at end of file