diff --git a/README.md b/README.md
index ef058cc..a7cd76a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 ## What is this?
 
-This repository allows you to quickly install Adminer database manager into a [Ddev](https://ddev.readthedocs.io) project using just `ddev get ddev/ddev-adminer`.
+This repository allows you to quickly install the [AdminerEvo](https://docs.adminerevo.org/) fork of the [adminer](https://www.adminer.org/) database manager into a [DDEV](https://ddev.readthedocs.io) project using just `ddev add-on get ddev/ddev-adminer`.
 
 Adminer is a full-featured database management tool written in PHP. This service
 currently ships the [official adminer container](https://hub.docker.com/_/adminer)
@@ -12,10 +12,7 @@ with no _external_ plugins. It contains all official plugins and themes and allo
 to easily chose one by editing the `docker-compose.adminer.yaml` file after
 installation.
 
-This currently supports:
-
-* MySQL / MariaDB
-* PostgreSQL
+AdminerEvo works with MySQL, MariaDB, PostgreSQL, SQLite, MS SQL, Oracle, Elasticsearch and MongoDB.
 
 ## Installation
 
@@ -31,7 +28,7 @@ For earlier versions of DDEV run
 ddev get ddev/ddev-adminer
 ```
 
-Afterwards run `ddev restart`
+Afterward run `ddev restart`
 
 Then you can just `ddev adminer` or use `ddev describe` to get the URL (`https://<project>.ddev.site:9101`).
 
diff --git a/adminer/Dockerfile b/adminer/Dockerfile
deleted file mode 100644
index 8a21407..0000000
--- a/adminer/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-#ddev-generated
-FROM adminer:standalone
-ADD ddev-login.php /var/www/html/plugins-enabled/
diff --git a/adminer/ddev-login.php b/adminer/ddev-login.php
deleted file mode 100644
index ab526d3..0000000
--- a/adminer/ddev-login.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-// #ddev-generated
-class DDEVLogin {
-    function loginForm() {
-    ?>
-        <script type="text/javascript" <?php echo nonce(); ?>>
-        addEventListener('load', function () {
-            // Prevent infinite reload loop when auto login failed.
-            if (document.querySelector('.error')) {
-                return
-            }
-            let dbimage = '<?php echo $_ENV["DDEV_DBIMAGE"] ?>'
-            // Default driver is mysql ("server"). We don't want to set it if that's the case.dbimage
-            // The only other currently supported driver is pgsql
-            if (!dbimage.includes('mariadb') && !dbimage.includes('mysql')) {
-                document.querySelector('[name="auth[driver]"]').value = "pgsql"
-            }
-            document.querySelector('[name="auth[db]"]').value = '<?php echo $_ENV['DDEV_DB_NAME']; ?>'
-            document.querySelector('[name="auth[username]"]').value = '<?php echo $_ENV['DDEV_DB_USER']; ?>'
-            document.querySelector('[name="auth[password]"]').value = '<?php echo $_ENV['DDEV_DB_PASS']; ?>'
-            document.querySelector('[name="auth[permanent]"]:not(:checked)')?.click()
-            document.querySelector('[type=submit][value=Login]').click()
-        });
-        </script>
-    <?php
-    }
-}
-return new DDEVLogin();
diff --git a/docker-compose.adminer.yaml b/docker-compose.adminer.yaml
index dabc228..c09ca86 100644
--- a/docker-compose.adminer.yaml
+++ b/docker-compose.adminer.yaml
@@ -2,12 +2,14 @@
 services:
   adminer:
     container_name: ddev-${DDEV_SITENAME}-adminer
-    build:
-      context: './adminer'
+    image: shyim/adminerevo:latest
     environment:
       # Use the line below to change the adminer theme.
       # - ADMINER_DESIGN=nette
       - ADMINER_DEFAULT_SERVER=db
+      - ADMINER_DEFAULT_USER=db
+      - ADMINER_DEFAULT_PASSWORD=db
+      - ADMINER_DEFAULT_DB=db
       - ADMINER_PLUGINS=tables-filter
       - VIRTUAL_HOST=$DDEV_HOSTNAME
       - HTTP_EXPOSE=9100:8080
diff --git a/install.yaml b/install.yaml
index 555b897..c71da54 100644
--- a/install.yaml
+++ b/install.yaml
@@ -4,7 +4,6 @@ name: adminer
 project_files:
 - docker-compose.adminer.yaml
 - docker-compose.adminer_norouter.yaml
-- adminer
 - commands/host/adminer
 
 pre_install_actions:
@@ -13,6 +12,24 @@ pre_install_actions:
     #ddev-nodisplay
     #ddev-description:Checking DDEV version
     (ddev debug capabilities | grep corepack >/dev/null) || (echo "Please upgrade DDEV to v1.23+ to use this add-on." && false)
+  - |
+    #ddev-nodisplay
+    #ddev-description:Removing old adminer files
+    has_old_files=false
+    for file in "${DDEV_APPROOT}/.ddev/adminer/Dockerfile" "${DDEV_APPROOT}/.ddev/adminer/ddev-login.php"; do
+      if [ ! -f "${file}" ]; then
+        continue
+      fi
+      if grep -q '#ddev-generated' "${file}"; then
+        rm -f "${file}"
+      else
+        echo "${file} needs to be removed but has been modified by the user. Please check it and remove it"
+        has_old_files=true
+      fi
+    done
+    if [ "${has_old_files}" = true ]; then
+      exit 2
+    fi
 
 post_install_actions:
   - |