diff --git a/.github/workflows/ci-81.yml b/.github/workflows/ci-83.yml
similarity index 92%
rename from .github/workflows/ci-81.yml
rename to .github/workflows/ci-83.yml
index 7bcb9a3..1115f2a 100644
--- a/.github/workflows/ci-81.yml
+++ b/.github/workflows/ci-83.yml
@@ -1,17 +1,17 @@
-name: Magento 2.4 CI with PHP 8.1
+name: Magento 2.4.8 CI with PHP 8.3
 
 on:
   - push
 
 jobs:
-  ci:
+  ci-83:
     runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
 
       - name: Launch Magento test environment
         env:
-          PHP: "81"
+          PHP: "83"
           COMPOSE_INTERACTIVE_NO_CLI: "1"
         run: make up
 
diff --git a/.github/workflows/ci-82.yml b/.github/workflows/ci-84.yml
similarity index 92%
rename from .github/workflows/ci-82.yml
rename to .github/workflows/ci-84.yml
index 42f9365..f06b814 100644
--- a/.github/workflows/ci-82.yml
+++ b/.github/workflows/ci-84.yml
@@ -1,17 +1,17 @@
-name: Magento 2.4.6 CI with PHP 8.2
+name: Magento 2.4.8 CI with PHP 8.4
 
 on:
   - push
 
 jobs:
-  ci:
+  ci-84:
     runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
 
       - name: Launch Magento test environment
         env:
-          PHP: "82"
+          PHP: "84"
           COMPOSE_INTERACTIVE_NO_CLI: "1"
         run: make up
 
diff --git a/CLAUDE.md b/CLAUDE.md
index fdeedcf..ba31001 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -19,7 +19,7 @@ make fix-session-expire  # Fix session timeout (sets base URL to 127.0.0.1)
 make logs            # Tail all Docker logs
 ```
 
-PHP version selection: `PHP=81 make up` or `PHP=82 make up`
+PHP version selection: `PHP=83 make up` or `PHP=84 make up` (default 84)
 
 ### JavaScript/TypeScript Build
 
diff --git a/Dockerfile b/Dockerfile
index 580b12c..a9e54bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=idealpostcodes/magento-test:m2.4-php8.1
+ARG BASE_IMAGE=idealpostcodes/magento-test:m2.4.8-p4-php8.4
 FROM $BASE_IMAGE
 
 COPY docker/install-magento /usr/local/bin/install-magento
diff --git a/Makefile b/Makefile
index 91c473e..0728726 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-PHP ?= 81
+PHP ?= 84
 PLATFORM ?= $(shell uname -m)
 YML_SUFFIX := $(if $(filter arm64,$(PLATFORM)),-arm64,)
-SEARCH_HOST := $(if $(filter 84,$(PHP)),opensearch,elasticsearch)
+SEARCH_HOST := $(if $(filter 83 84,$(PHP)),opensearch,elasticsearch)
 .DEFAULT_GOAL := help
 TAG=${git describe --tags}
 
@@ -18,7 +18,7 @@ down:
 ## Build and run
 .PHONY: build
 build:
-	docker compose -f docker-compose.yml -f docker/${PHP}${YML_SUFFIX}.yml up -d --wait
+	docker compose -f docker-compose.yml -f docker/${PHP}${YML_SUFFIX}.yml up -d --build --wait
 
 ## Initialise repository - run install-magento
 .PHONY: init
diff --git a/README.md b/README.md
index fcaca19..f30eccd 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,10 @@
 
 This extension enables [Ideal-Postcodes.co.uk](https://ideal-postcodes.co.uk) address validation for UK addresses on a Magento store.
 
-Tested on Magento 2.1 - 2.4 on PHP 7.1-7.3
+Tested on Magento 2.4.8 on PHP 8.3 and 8.4. Requires PHP 7.0 or later.
 
-![Magento 2.1 CI](https://github.com/ideal-postcodes/magento/workflows/Magento%202.1%20CI/badge.svg)
-![Magento 2.2 CI](https://github.com/ideal-postcodes/magento/workflows/Magento%202.2%20CI/badge.svg)
-![Magento 2.3 CI](https://github.com/ideal-postcodes/magento/workflows/Magento%202.3%20CI/badge.svg)
-![Magento 2.4 CI](https://github.com/ideal-postcodes/magento/workflows/Magento%202.4%20CI/badge.svg)
+![PHP 8.3 CI](https://github.com/ideal-postcodes/magento/actions/workflows/ci-83.yml/badge.svg)
+![PHP 8.4 CI](https://github.com/ideal-postcodes/magento/actions/workflows/ci-84.yml/badge.svg)
 
 See our [guide](https://ideal-postcodes.co.uk/guides/magento) for installation and configuration instructions.
 
diff --git a/composer.json b/composer.json
index 5e7fffe..c3dd8c1 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
   "description": "Ideal Postcodes UK address search magento extension. Ideal-Postcodes.co.uk",
   "type": "magento2-module",
   "require": {
-    "php": "~5.5.0|~5.6.0|>=7.0|>=8.0"
+    "php": "^7.0||^8.0"
   },
   "support": {
     "email": "support@ideal-postcodes.co.uk",
diff --git a/docker/83-arm64.yml b/docker/83-arm64.yml
new file mode 100644
index 0000000..3125a97
--- /dev/null
+++ b/docker/83-arm64.yml
@@ -0,0 +1,33 @@
+version: "3.0"
+services:
+  opensearch:
+    image: opensearchproject/opensearch:2.12.0
+    container_name: opensearch
+    platform: linux/arm64
+    ports:
+      - "9200:9200"
+      - "9600:9600"
+    environment:
+      - discovery.type=single-node
+      - DISABLE_INSTALL_DEMO_CONFIG=true
+      - DISABLE_SECURITY_PLUGIN=true
+      - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
+    mem_limit: 1g
+  web:
+    depends_on:
+      - opensearch
+    environment:
+      - SEARCH_ENGINE=opensearch
+      - SEARCH_HOST=opensearch
+    build:
+      context: "."
+      dockerfile: "Dockerfile"
+      args:
+        BASE_IMAGE: idealpostcodes/magento-test:m2.4.8-p4-php8.3
diff --git a/docker/83.yml b/docker/83.yml
new file mode 100644
index 0000000..7be27c4
--- /dev/null
+++ b/docker/83.yml
@@ -0,0 +1,32 @@
+version: "3.0"
+services:
+  opensearch:
+    image: opensearchproject/opensearch:2.12.0
+    container_name: opensearch
+    ports:
+      - "9200:9200"
+      - "9600:9600"
+    environment:
+      - discovery.type=single-node
+      - DISABLE_INSTALL_DEMO_CONFIG=true
+      - DISABLE_SECURITY_PLUGIN=true
+      - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
+    mem_limit: 1g
+  web:
+    depends_on:
+      - opensearch
+    environment:
+      - SEARCH_ENGINE=opensearch
+      - SEARCH_HOST=opensearch
+    build:
+      context: "."
+      dockerfile: "Dockerfile"
+      args:
+        BASE_IMAGE: idealpostcodes/magento-test:m2.4.8-p4-php8.3