diff --git a/README.md b/README.md
index eb5329ec6..c7a8b23b1 100644
--- a/README.md
+++ b/README.md
@@ -43,18 +43,9 @@ V2X Hub is a communication, computation, and processing platform for V2I applica
 	* Aggregation of vehicle weather data for efficient communication to Transportation Management Entity for weather-responsive traffic management.
 	* Multi-Modal Intelligent Traffic Signal Systems (MMITSS) “intersection level” functions including J2735 Intersection Geometry (MAP) and J2735 Signal Phase and Timing (SPaT) broadcast manager, equipped vehicle tracker, priority request server, and interface to traffic signal controller.
 
-# Simulation Setup
-To support execution in a simulated environment, V2X-Hub is in the process of integrating with CDASim, a Co-Simulation tool built as an extension of Eclipse Mosiac. This extension will incorporate integration with several other platforms including CARMA-Platform and CARLA. The setup for this simply requires setting environment variables inside the V2X-Hub docker container.
- * **SIMULATION_MODE** – Environment variable for enabling simulation components for V2X-Hub. If set to "true" or "TRUE" simulation components will be enable. Otherwise, simulation components will not be enabled.
- * **KAFKA_BROKER_ADDRESS** – Environment variable for storing Kafka broker connection string (including port).
- * **TIME_SYNC_TOPIC** – Environment variable for storing Kafka time sync topic.
- * **SIMULATION_IP** – Environment variable for storing IP address of CDASim application.
- * **SIMULATION_REGISTRATION_PORT** – Environment variable for storing port on CDASim that handles registration attempts.
- * **TIME_SYNC_PORT** – Environment varaible for storing port for receiving time sync messages from CDASim.
- * **V2X_PORT** – Environment variable for storing port for receiving v2x messages from CDASim
- * **SIM_V2X_PORT** – Environment variable for storing port for sending v2x messages to CDASim
- * **LOCAL_IP** – Environment variable for storing local IP of V2X Hub.
- * **INFRASTRUCTURE_ID** – Environment variable for storing infrastructure id of V2X Hub..
+## Deployment Configuration
+The instructions for deployment and configuration are located here: [Instructions](<configuration/README.md>)
+
 ## Release Notes
 The current version and release history of the V2X Hub software platform can be found here: [Release Notes](<docs/Release_notes.md>)
 
diff --git a/configuration/README.md b/configuration/README.md
index 507534b38..7b978c398 100644
--- a/configuration/README.md
+++ b/configuration/README.md
@@ -1,15 +1,17 @@
-## Deployment Configuration
-### Introduction
-This directory contains deployment configurations for deploying V2X-Hub on both ARM64(arm64) and x86(amd64) architectures. 
+## Introduction
+This directory contains deployment and configuration instructions for deploying V2X-Hub on both ARM64(arm64) and x86(amd64) architectures.
+
+> [!NOTE]
+> Separate deployment files/configurations are no longer necessary for arm64 and x86 deployments.
+
 ### Deployment Instructions
-Once downloaded, navigate to the directory corresponding to your computer’s processor (1) or (2):
+Once downloaded, navigate to the configuration directory:
 ```
-cd ~/V2X-Hub/configuration/arm64/
-cd ~/V2X-Hub/configuration/amd64/
+cd ~/V2X-Hub/configuration/
 ```
 Run the initialization script:
 ```
-./initialization.sh
+sudo ./initialization.sh
 ```
 Follow the prompts during installation.
 
@@ -40,3 +42,16 @@ Close the Privacy Error tab and wait for the initial V2X Hub tab to finish loadi
 Enter the login credentials you created in step 5b and login.
 
 Installation complete!
+
+### Simulation Setup
+To support execution in a simulated environment, V2X-Hub is in the process of integrating with CDASim, a Co-Simulation tool built as an extension of Eclipse Mosiac. This extension will incorporate integration with several other platforms including CARMA-Platform and CARLA. The setup for this simply requires setting environment variables inside the V2X-Hub docker container.
+ * **SIMULATION_MODE** – Environment variable for enabling simulation components for V2X-Hub. If set to "true" or "TRUE" simulation components will be enable. Otherwise, simulation components will not be enabled.
+ * **KAFKA_BROKER_ADDRESS** – Environment variable for storing Kafka broker connection string (including port).
+ * **TIME_SYNC_TOPIC** – Environment variable for storing Kafka time sync topic.
+ * **SIMULATION_IP** – Environment variable for storing IP address of CDASim application.
+ * **SIMULATION_REGISTRATION_PORT** – Environment variable for storing port on CDASim that handles registration attempts.
+ * **TIME_SYNC_PORT** – Environment varaible for storing port for receiving time sync messages from CDASim.
+ * **V2X_PORT** – Environment variable for storing port for receiving v2x messages from CDASim
+ * **SIM_V2X_PORT** – Environment variable for storing port for sending v2x messages to CDASim
+ * **LOCAL_IP** – Environment variable for storing local IP of V2X Hub.
+ * **INFRASTRUCTURE_ID** – Environment variable for storing infrastructure id of V2X Hub..
\ No newline at end of file
diff --git a/configuration/amd64/mysql/add_v2xhub_user.bash b/configuration/amd64/mysql/add_v2xhub_user.bash
deleted file mode 100755
index 0d9ab218b..000000000
--- a/configuration/amd64/mysql/add_v2xhub_user.bash
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# Fail when any command fails
-#set -e
-
-# Ensure mysql-client is installed
-REQUIRED_PKG="mysql-client"
-PKG_OK=$(dpkg-query -W --showformat='${Status}\n' $REQUIRED_PKG|grep "install ok installed")
-echo Checking for $REQUIRED_PKG: $PKG_OK
-if [ "" = "$PKG_OK" ]; then
-  echo "No $REQUIRED_PKG found. Installing $REQUIRED_PKG."
-  sudo apt-get update
-  sudo apt-get --yes install $REQUIRED_PKG
-fi
-
-# Adds V2X-Hub user to mysql db
-read -p "Please enter a username: " USER
-echo "Password must be 8-12 charcters, and contain at least one of each of the following: uppercase letter, lowercase letter, number, and symbol."
-read -s -p "Please enter a password: "  PASS
-
-PASS_LENGTH=`echo $PASS | wc -c`
-
-if [ $PASS_LENGTH -ge 8 ] && echo $PASS | grep -q [a-z] && echo $PASS | grep -q [A-Z] && echo $PASS | grep -q [0-9] && ( echo $PASS | grep -q [\$\!\.\+_\*@\#\^%\?~] || echo $PASS | grep -q [-] ); then
-    echo
-    read -s -p "Confirm password: " CONF_PASS
-    while [ $CONF_PASS != $PASS ]; do
-        echo
-        read -s -p "Passwords do not match. Please re-enter password: " CONF_PASS
-    done
-    echo "VALID PASSWORD"
-    echo "Enter MYSQL ROOT PASSWORD: "
-    mysql -uroot -p --silent -h127.0.0.1 -e "INSERT INTO IVP.user (IVP.user.username, IVP.user.password, IVP.user.accessLevel) VALUES('$USER', SHA2('$PASS', 256), 3)"
-    echo "V2X Hub user successfully added"
-else
-    echo "INVALID PASSWORD"
-    echo "Password must be 8-12 charcters, and contain at least one of each of the following: uppercase letter, lowercase letter, number, and symbol"
-    exit 1
-fi
diff --git a/configuration/arm64/docker-compose.yml b/configuration/arm64/docker-compose.yml
deleted file mode 100644
index 23b6e017c..000000000
--- a/configuration/arm64/docker-compose.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-version: '3.7'
-
-services:
-  db:
-    image: mariadb:10.4
-    container_name: mysql
-    restart: always
-    environment:
-      - MYSQL_DATABASE=IVP
-      - MYSQL_USER=IVP
-      - MYSQL_PASSWORD_FILE=/run/secrets/mysql_password
-      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/mysql_root_password
-    network_mode: host
-    secrets:
-      - mysql_password
-      - mysql_root_password
-    volumes:
-      - ./mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
-      - ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql
-      - mysql-datavolume:/var/lib/mysql
-
-  php:
-    image: usdotfhwaops/php_arm:${V2XHUB_VERSION:-develop}
-    container_name: php
-    network_mode: host
-    restart: always
-    depends_on:
-      - db
-      - v2xhub
-    stdin_open: true
-    tty: true
-
-  v2xhub:
-    image: usdotfhwaops/v2xhubarm:${V2XHUB_VERSION:-develop}
-    container_name: v2xhub
-    network_mode: host
-    restart: always
-    depends_on:
-      - db
-    environment:
-      - MYSQL_PASSWORD=/run/secrets/mysql_password
-      - INFRASTRUCTURE_ID=rsu_<J2735 MAP MESSAGE INTERSECTION ID>
-      - INFRASTRUCTURE_NAME=<RSU_NAME>
-    secrets:
-      - mysql_password
-    volumes:
-      - ./logs:/var/log/tmx
-      - ./MAP:/var/www/plugins/MAP
-  port_drayage_webservice:
-    image: usdotfhwaops/port-drayage-webservice_arm:${V2XHUB_VERSION:-develop}
-    container_name: port_drayage_webservice
-    network_mode: host
-secrets:
-    mysql_password:
-        file: ./secrets/mysql_password.txt
-    mysql_root_password:
-        file: ./secrets/mysql_root_password.txt
-
-volumes:
-  mysql-datavolume:
diff --git a/configuration/arm64/initialization.sh b/configuration/arm64/initialization.sh
deleted file mode 100755
index 5894602fd..000000000
--- a/configuration/arm64/initialization.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-directory=$(pwd)
-mysqlDir="$directory/mysql"
-
-# Update and upgrade commands to update linux OS
-sudo apt update -y && sudo apt upgrade -y
-
-# Install necessary and useful apps
-sudo apt-get install chromium-browser -y
-
-# Make passwords for mysql
-mkdir -p secrets && cd secrets
-
-# Creates password files where user inputs password
-FILE1=mysql_root_password.txt
-FILE2=mysql_password.txt
-if test -f "$FILE1"; then
-    echo "$FILE1 exists."
-else
-    read -p "enter password for the mysql_root_password: " sql_root_pass
-    echo "$sql_root_pass" > sql_root_pass.txt
-    # Remove endline characters from password files
-    tr -d '\n' <sql_root_pass.txt> mysql_root_password.txt && rm sql_root_pass.txt
-fi
-
-if test -f "$FILE2"; then
-    echo "$FILE2 exists."
-else
-    read -p "enter password for mysql_password: " sql_pass
-    echo "$sql_pass" > sql_pass.txt
-    # Remove endline characters from password files
-    tr -d '\n' <sql_pass.txt> mysql_password.txt && rm sql_pass.txt
-fi
-# TODO VH-1303 Allow for version and configuration selection in initialization script
-
-# ARM64 initialization
-cd $directory
-for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do sudo apt-get remove $pkg; done
-# Add Docker's official GPG key:
-sudo apt-get update
-sudo apt-get install ca-certificates curl
-sudo install -m 0755 -d /etc/apt/keyrings
-sudo curl -fsSL https://download.docker.com/linux/$(. /etc/os-release && echo "$ID")/gpg -o /etc/apt/keyrings/docker.asc
-sudo chmod a+r /etc/apt/keyrings/docker.asc
-
-# Add the repository to Apt sources:
-echo \
-  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/$(. /etc/os-release && echo "$ID") \
-  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
-  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-sudo apt-get update
-sudo apt-get -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
-sudo docker compose up -d
-
-# Create V2X Hub user
-cd $mysqlDir
-./add_v2xhub_user.bash
-
-chromium-browser "http://127.0.0.1" > /dev/null 2>&1 &
-chromium-browser "https://127.0.0.1:19760" > /dev/null 2>&1 &
diff --git a/configuration/arm64/mysql/localhost.sql b/configuration/arm64/mysql/localhost.sql
deleted file mode 100644
index 3ef568522..000000000
--- a/configuration/arm64/mysql/localhost.sql
+++ /dev/null
@@ -1,255 +0,0 @@
--- MySQL dump 10.13  Distrib 5.7.35, for Linux (x86_64)
---
--- Host: 127.0.0.1    Database: IVP
--- ------------------------------------------------------
--- Server version	5.7.35
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Current Database: `IVP`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `IVP` /*!40100 DEFAULT CHARACTER SET latin1 */;
-
-USE `IVP`;
-
---
--- Table structure for table `eventLog`
---
-
-DROP TABLE IF EXISTS `eventLog`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `eventLog` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
-  `description` text NOT NULL COMMENT 'The log message content',
-  `source` text NOT NULL COMMENT 'The name of the plugin or other agent that logged the event',
-  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'The date and time of the event in UTC',
-  `logLevel` enum('Debug','Info','Warning','Error','Fatal') NOT NULL COMMENT 'The type of event being logged, one of   	- Debug 	- Info 	- Warn 	- Error',
-  `uploaded` tinyint(1) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=latin1 COMMENT='This table records events generated by every IVP core component and plugin in the IVP platform.  ';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `installedPlugin`
---
-
-DROP TABLE IF EXISTS `installedPlugin`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `installedPlugin` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `pluginId` int(10) unsigned NOT NULL,
-  `path` text NOT NULL,
-  `exeName` text NOT NULL,
-  `manifestName` text NOT NULL,
-  `commandLineParameters` text NOT NULL,
-  `enabled` tinyint(1) NOT NULL,
-  `maxMessageInterval` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `pluginId` (`pluginId`),
-  CONSTRAINT `installedPlugin_ibfk_2` FOREIGN KEY (`pluginId`) REFERENCES `plugin` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `messageActivity`
---
-
-DROP TABLE IF EXISTS `messageActivity`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `messageActivity` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
-  `messageTypeId` int(10) unsigned NOT NULL COMMENT 'Foreign key into the messageType table',
-  `pluginId` int(10) unsigned NOT NULL,
-  `count` int(10) unsigned NOT NULL,
-  `lastReceivedTimestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'The date and time of the most recent message of a type in UTC.',
-  `averageInterval` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `messageTypeId_pluginId` (`messageTypeId`,`pluginId`),
-  KEY `messageTypeId` (`messageTypeId`),
-  KEY `pluginId` (`pluginId`),
-  CONSTRAINT `messageActivity_ibfk_1` FOREIGN KEY (`messageTypeId`) REFERENCES `messageType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `messageActivity_ibfk_2` FOREIGN KEY (`pluginId`) REFERENCES `plugin` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=latin1 COMMENT='This table records the most recent message activity of each active plugin in the IVP system. The data in this table is updated by the IVP plugin monitor core component for every message the plugin monitor receives.';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `messageType`
---
-
-DROP TABLE IF EXISTS `messageType`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `messageType` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
-  `type` varchar(50) NOT NULL COMMENT 'A unique message type name',
-  `subtype` varchar(50) NOT NULL,
-  `description` text COMMENT 'A description of the message type',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `type` (`type`,`subtype`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=latin1 COMMENT='This table lists the valid message types of every plugin loaded on the IVP platform.';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `plugin`
---
-
-DROP TABLE IF EXISTS `plugin`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `plugin` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
-  `name` varchar(100) NOT NULL COMMENT 'A unique plugin name',
-  `description` text,
-  `version` text,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=latin1 COMMENT='This table lists the plugins loaded and available to run on the IVP platform.';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `pluginActivity`
---
-
-DROP TABLE IF EXISTS `pluginActivity`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `pluginActivity` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
-  `msgReceivedTimestamp` bigint(20) unsigned NOT NULL COMMENT 'Timestamp in microseconds since Epoch of when message was received by destination Plugin',
-  `rPluginName` varchar(100) NOT NULL COMMENT 'Name of receiving plugin',
-  `sPluginName` varchar(100) NOT NULL COMMENT 'Name of source plugin',
-  `msgType` varchar(100) NOT NULL COMMENT 'Type of message',
-  `msgSubtype` varchar(100) NOT NULL COMMENT 'Subtype of message',
-  `msgCreatedTimestamp` bigint(20) NOT NULL COMMENT 'Timestamp in milliseconds since Epoch of when message was created.',
-  `msgHandledTimestamp` bigint(20) NOT NULL COMMENT 'Timestamp in milliseconds since Epoch of when receiving plugin finished handling message.',
-  `origMsgTimestamp` bigint(20) NOT NULL COMMENT 'Timestamp in milliseconds since Epoch of the original message that triggered this message sequence.',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `msgReceivedTimestamp_rPluginName` (`msgReceivedTimestamp`,`rPluginName`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='This table records all message activity of each active plugin in the IVP system. The data in this table is updated by each Plugin as part of PluginClient base class implementation.';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `pluginConfigurationParameter`
---
-
-DROP TABLE IF EXISTS `pluginConfigurationParameter`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `pluginConfigurationParameter` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
-  `pluginId` int(10) unsigned NOT NULL,
-  `key` varchar(255) NOT NULL COMMENT 'The name of a configuration parameter.',
-  `value` text NOT NULL COMMENT 'The value of a configuration parameter',
-  `defaultValue` text NOT NULL,
-  `description` text NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `pluginId_key` (`pluginId`,`key`),
-  KEY `pluginId` (`pluginId`),
-  CONSTRAINT `pluginConfigurationParameter_ibfk_1` FOREIGN KEY (`pluginId`) REFERENCES `plugin` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=113 DEFAULT CHARSET=latin1 COMMENT='This table lists the IVP system configuration parameters used by both core components and plugins to control the behavior of the system.';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `pluginMessageMap`
---
-
-DROP TABLE IF EXISTS `pluginMessageMap`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `pluginMessageMap` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
-  `pluginId` int(10) unsigned NOT NULL COMMENT 'Foreign key into the plugin table',
-  `messageTypeId` int(10) unsigned NOT NULL COMMENT 'Foreign key into the messageType table.',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `pluginId` (`pluginId`,`messageTypeId`),
-  KEY `pluginId_2` (`pluginId`),
-  KEY `messageTypeId` (`messageTypeId`),
-  CONSTRAINT `pluginMessageMap_ibfk_1` FOREIGN KEY (`pluginId`) REFERENCES `plugin` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `pluginMessageMap_ibfk_2` FOREIGN KEY (`messageTypeId`) REFERENCES `messageType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1592 DEFAULT CHARSET=latin1 COMMENT='This table identifies the types of messages generated by each plugin.';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `pluginStatus`
---
-
-DROP TABLE IF EXISTS `pluginStatus`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `pluginStatus` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `pluginId` int(10) unsigned NOT NULL,
-  `key` varchar(100) NOT NULL,
-  `value` text NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `UQ_pluginId_key` (`pluginId`,`key`),
-  KEY `pluginId` (`pluginId`),
-  CONSTRAINT `pluginStatus_ibfk_2` FOREIGN KEY (`pluginId`) REFERENCES `plugin` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `systemConfigurationParameter`
---
-
-DROP TABLE IF EXISTS `systemConfigurationParameter`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `systemConfigurationParameter` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
-  `key` varchar(255) NOT NULL COMMENT 'The name of a configuration parameter.',
-  `value` text NOT NULL COMMENT 'The value of a configuration parameter',
-  `defaultValue` text NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key` (`key`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COMMENT='This table lists the IVP system configuration parameters used by both core components and plugins to control the behavior of the system.';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `user`
---
-
-DROP TABLE IF EXISTS `user`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `user` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
-  `username` varchar(50) NOT NULL COMMENT 'The account name for the user, typically an email address',
-  `password` varchar(64) NOT NULL COMMENT 'An encrypted password',
-  `accessLevel` int(11) NOT NULL DEFAULT '1' COMMENT 'The access level permitted for this user, one of: \n  	1. read-only access to portal 	2. application administrator access 	3. system administrator, all access',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `UQ_user_id` (`id`),
-  UNIQUE KEY `UQ_user_username` (`username`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=latin1 COMMENT='The list of accounts that can access the IVP platform via the administrative portal is held in the users table.';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
diff --git a/configuration/arm64/mysql/port_drayage.sql b/configuration/arm64/mysql/port_drayage.sql
deleted file mode 100644
index 71c93e51f..000000000
--- a/configuration/arm64/mysql/port_drayage.sql
+++ /dev/null
@@ -1,91 +0,0 @@
--- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
---
--- Host: 127.0.0.1    Database: PORT_DRAYAGE
--- ------------------------------------------------------
--- Server version	5.7.35
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Current Database: `PORT_DRAYAGE`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `PORT_DRAYAGE` /*!40100 DEFAULT CHARACTER SET latin1 */;
-
-USE `PORT_DRAYAGE`;
-
---
--- Table structure for table `first_action`
---
-
-DROP TABLE IF EXISTS `first_action`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `first_action` (
-  `cmv_id` int(4) NOT NULL,
-  `cargo_id` varchar(20) DEFAULT NULL,
-  `destination_lat` decimal(9,7) NOT NULL,
-  `destination_long` decimal(9,7) NOT NULL,
-  `operation` varchar(20) NOT NULL,
-  `action_id` varchar(36) NOT NULL,
-  `next_action` varchar(36) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `first_action`
---
-
-LOCK TABLES `first_action` WRITE;
-/*!40000 ALTER TABLE `first_action` DISABLE KEYS */;
-INSERT INTO `first_action` VALUES (123,'SOME_CARGO',38.9548890,-77.1481430,'PICKUP','4bea1c45-e421-11eb-a8cc-000c29ae389d','32320c8a-e422-11eb-a8cc-000c29ae389d');
-/*!40000 ALTER TABLE `first_action` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `freight`
---
-
-DROP TABLE IF EXISTS `freight`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `freight` (
-  `cmv_id` int(4) NOT NULL,
-  `cargo_id` varchar(20) DEFAULT NULL,
-  `destination_lat` decimal(9,7) NOT NULL,
-  `destination_long` decimal(9,7) NOT NULL,
-  `operation` varchar(20) NOT NULL,
-  `action_id` varchar(36) NOT NULL,
-  `next_action` varchar(36) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `freight`
---
-
-LOCK TABLES `freight` WRITE;
-/*!40000 ALTER TABLE `freight` DISABLE KEYS */;
-INSERT INTO `freight` VALUES (123,NULL,38.9549780,-77.1475790,'EXIT_STAGING_AREA','32320c8a-e422-11eb-a8cc-000c29ae389d','4ace39e6-ee36-11eb-9a03-0242ac130003'),(123,'SOME_CARGO',38.9548890,-77.1481430,'PICKUP','4bea1c45-e421-11eb-a8cc-000c29ae389d','32320c8a-e422-11eb-a8cc-000c29ae389d');
-/*!40000 ALTER TABLE `freight` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2021-07-21 11:42:55
diff --git a/configuration/arm64/mysql/suntrax/README.txt b/configuration/arm64/mysql/suntrax/README.txt
deleted file mode 100644
index 750c98eac..000000000
--- a/configuration/arm64/mysql/suntrax/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-These SQL files are Port Drayage actions created for SunTrax Verification Testing.
\ No newline at end of file
diff --git a/configuration/arm64/mysql/suntrax/port_area_operations.sql b/configuration/arm64/mysql/suntrax/port_area_operations.sql
deleted file mode 100644
index abeb6e478..000000000
--- a/configuration/arm64/mysql/suntrax/port_area_operations.sql
+++ /dev/null
@@ -1,90 +0,0 @@
--- MySQL dump 10.13  Distrib 5.7.36, for Linux (x86_64)
---
--- Host: 127.0.0.1    Database: PORT_DRAYAGE
--- ------------------------------------------------------
--- Server version	5.7.36
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Current Database: `PORT_DRAYAGE`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `PORT_DRAYAGE` /*!40100 DEFAULT CHARACTER SET latin1 */;
-
-USE `PORT_DRAYAGE`;
-
---
--- Table structure for table `first_action`
---
-
-DROP TABLE IF EXISTS `first_action`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `first_action` (
-  `cmv_id` varchar(20) NOT NULL,
-  `cargo_id` varchar(20) DEFAULT NULL,
-  `destination_lat` decimal(9,7) NOT NULL,
-  `destination_long` decimal(9,7) NOT NULL,
-  `operation` varchar(20) NOT NULL,
-  `action_id` varchar(36) NOT NULL,
-  `next_action` varchar(36) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `first_action`
---
-
-LOCK TABLES `first_action` WRITE;
-/*!40000 ALTER TABLE `first_action` DISABLE KEYS */;
-/*!40000 ALTER TABLE `first_action` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `freight`
---
-
-DROP TABLE IF EXISTS `freight`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `freight` (
-  `cmv_id` varchar(20) NOT NULL,
-  `cargo_id` varchar(20) DEFAULT NULL,
-  `destination_lat` decimal(9,7) NOT NULL,
-  `destination_long` decimal(9,7) NOT NULL,
-  `operation` varchar(20) NOT NULL,
-  `action_id` varchar(36) NOT NULL,
-  `next_action` varchar(36) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `freight`
---
-
-LOCK TABLES `freight` WRITE;
-/*!40000 ALTER TABLE `freight` DISABLE KEYS */;
-INSERT INTO `freight` VALUES ('DOT-80550',NULL,28.1128156,-81.8314745,'ENTER_PORT','4ace39e6-ee36-11eb-9a03-0242ac130003','67eadd3a-38b4-11ec-930a-000145098e4f'),('DOT-80550','CARGO_A',28.1119763,-81.8312035,'DROPOFF','67eadd3a-38b4-11ec-930a-000145098e4f','0bf7ebda-38b5-11ec-930a-000145098e4f'),('DOT-80550','CARGO_B',28.1117373,-81.8309654,'PICKUP','0bf7ebda-38b5-11ec-930a-000145098e4f','9230504d-38b5-11ec-930a-000145098e4f'),('DOT-80550','CARGO_B',28.1120500,-81.8306483,'PORT_CHECKPOINT','9230504d-38b5-11ec-930a-000145098e4f','511ad052-38b6-11ec-930a-000145098e4f'),('DOT-80550','CARGO_B',28.1138052,-81.8317502,'EXIT_PORT','511ad052-38b6-11ec-930a-000145098e4f','fc15d52a-3c0c-11ec-b00d-000145098e4f'),('DOT-80550','CARGO_B',28.1232336,-81.8347566,'ENTER_STAGING_AREA','fc15d52a-3c0c-11ec-b00d-000145098e4f','5ceaab82-515c-11ec-9e2c-000145098e47'),('DOT-10004',NULL,28.1128156,-81.8314745,'ENTER_PORT','84f6b797-52c2-11ec-9105-000145098e4f','c9bba171-52c2-11ec-9105-000145098e4f'),('DOT-10004','CARGO_A',28.1119763,-81.8312035,'DROPOFF','c9bba171-52c2-11ec-9105-000145098e4f','8e1d456a-52c3-11ec-9105-000145098e4f'),('DOT-10004','CARGO_B',28.1117373,-81.8309654,'PICKUP','8e1d456a-52c3-11ec-9105-000145098e4f','744be658-52c4-11ec-9105-000145098e4f'),('DOT-10004','CARGO_B',28.1120500,-81.8306483,'PORT_CHECKPOINT','744be658-52c4-11ec-9105-000145098e4f','a4b419b9-52c5-11ec-9105-000145098e4f'),('DOT-10004','CARGO_B',28.1138052,-81.8317502,'EXIT_PORT','a4b419b9-52c5-11ec-9105-000145098e4f','20b546e3-52c6-11ec-9105-000145098e4f'),('DOT-10004','CARGO_B',28.1232336,-81.8347566,'ENTER_STAGING_AREA','20b546e3-52c6-11ec-9105-000145098e4f','53875eba-52c7-11ec-9105-000145098e4f');
-/*!40000 ALTER TABLE `freight` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2021-12-03 11:03:12
diff --git a/configuration/arm64/mysql/suntrax/staging_area_operations.sql b/configuration/arm64/mysql/suntrax/staging_area_operations.sql
deleted file mode 100644
index 7332feb90..000000000
--- a/configuration/arm64/mysql/suntrax/staging_area_operations.sql
+++ /dev/null
@@ -1,91 +0,0 @@
--- MySQL dump 10.13  Distrib 5.7.36, for Linux (x86_64)
---
--- Host: 127.0.0.1    Database: PORT_DRAYAGE
--- ------------------------------------------------------
--- Server version	5.7.36
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Current Database: `PORT_DRAYAGE`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `PORT_DRAYAGE` /*!40100 DEFAULT CHARACTER SET latin1 */;
-
-USE `PORT_DRAYAGE`;
-
---
--- Table structure for table `first_action`
---
-
-DROP TABLE IF EXISTS `first_action`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `first_action` (
-  `cmv_id` varchar(20) NOT NULL,
-  `cargo_id` varchar(20) DEFAULT NULL,
-  `destination_lat` decimal(9,7) NOT NULL,
-  `destination_long` decimal(9,7) NOT NULL,
-  `operation` varchar(20) NOT NULL,
-  `action_id` varchar(36) NOT NULL,
-  `next_action` varchar(36) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `first_action`
---
-
-LOCK TABLES `first_action` WRITE;
-/*!40000 ALTER TABLE `first_action` DISABLE KEYS */;
-INSERT INTO `first_action` VALUES ('DOT-80550','CARGO_A',28.1249788,-81.8348897,'PICKUP','4bea1c45-e421-11eb-a8cc-000c29ae389d','32320c8a-e422-11eb-a8cc-000c29ae389d'),('DOT-10004','CARGO_A',28.1249788,-81.8348897,'PICKUP','66bba4a0-52c1-11ec-9105-000145098e4f','66bba4cb-52c1-11ec-9105-000145098e4f');
-/*!40000 ALTER TABLE `first_action` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `freight`
---
-
-DROP TABLE IF EXISTS `freight`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `freight` (
-  `cmv_id` varchar(20) NOT NULL,
-  `cargo_id` varchar(20) DEFAULT NULL,
-  `destination_lat` decimal(9,7) NOT NULL,
-  `destination_long` decimal(9,7) NOT NULL,
-  `operation` varchar(20) NOT NULL,
-  `action_id` varchar(36) NOT NULL,
-  `next_action` varchar(36) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `freight`
---
-
-LOCK TABLES `freight` WRITE;
-/*!40000 ALTER TABLE `freight` DISABLE KEYS */;
-INSERT INTO `freight` VALUES ('DOT-80550',NULL,28.1232195,-81.8348278,'EXIT_STAGING_AREA','32320c8a-e422-11eb-a8cc-000c29ae389d','4ace39e6-ee36-11eb-9a03-0242ac130003'),('DOT-80550','CARGO_A',28.1249788,-81.8348897,'PICKUP','4bea1c45-e421-11eb-a8cc-000c29ae389d','32320c8a-e422-11eb-a8cc-000c29ae389d'),('DOT-80550',NULL,28.1128156,-81.8314745,'ENTER_PORT','4ace39e6-ee36-11eb-9a03-0242ac130003','67eadd3a-38b4-11ec-930a-000145098e4f'),('DOT-80550','CARGO_B',28.1232336,-81.8347566,'ENTER_STAGING_AREA','fc15d52a-3c0c-11ec-b00d-000145098e4f','5ceaab82-515c-11ec-9e2c-000145098e47'),('DOT-10004','CARGO_A',28.1249788,-81.8348897,'PICKUP','66bba4a0-52c1-11ec-9105-000145098e4f','66bba4cb-52c1-11ec-9105-000145098e4f'),('DOT-10004',NULL,28.1232195,-81.8348278,'EXIT_STAGING_AREA','66bba4cb-52c1-11ec-9105-000145098e4f','84f6b797-52c2-11ec-9105-000145098e4f'),('DOT-10004',NULL,28.1128156,-81.8314745,'ENTER_PORT','84f6b797-52c2-11ec-9105-000145098e4f','c9bba171-52c2-11ec-9105-000145098e4f'),('DOT-10004','CARGO_B',28.1232336,-81.8347566,'ENTER_STAGING_AREA','20b546e3-52c6-11ec-9105-000145098e4f','53875eba-52c7-11ec-9105-000145098e4f');
-/*!40000 ALTER TABLE `freight` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2021-12-03 11:25:03
diff --git a/configuration/amd64/docker-compose.yml b/configuration/docker-compose.yml
similarity index 95%
rename from configuration/amd64/docker-compose.yml
rename to configuration/docker-compose.yml
index a2dad081e..f73735c3b 100755
--- a/configuration/amd64/docker-compose.yml
+++ b/configuration/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   db:
-    image: mysql:5.7
+    image: mysql:8.0
     container_name: mysql
     restart: always
     environment:
@@ -31,7 +31,7 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubamd:${V2XHUB_VERSION:-develop}
+    image: usdotfhwaops/v2xhub:${V2XHUB_VERSION:-develop}
     container_name: v2xhub
     network_mode: host
     restart: always
diff --git a/configuration/amd64/initialization.sh b/configuration/initialization.sh
similarity index 100%
rename from configuration/amd64/initialization.sh
rename to configuration/initialization.sh
diff --git a/configuration/amd64/logs/filewatchscript.sh b/configuration/logs/filewatchscript.sh
similarity index 100%
rename from configuration/amd64/logs/filewatchscript.sh
rename to configuration/logs/filewatchscript.sh
diff --git a/configuration/arm64/mysql/add_v2xhub_user.bash b/configuration/mysql/add_v2xhub_user.bash
similarity index 96%
rename from configuration/arm64/mysql/add_v2xhub_user.bash
rename to configuration/mysql/add_v2xhub_user.bash
index 5b4b6f314..6ee0250e4 100755
--- a/configuration/arm64/mysql/add_v2xhub_user.bash
+++ b/configuration/mysql/add_v2xhub_user.bash
@@ -4,6 +4,7 @@
 
 # Ensure mysql-client is installed
 arch=$(dpkg --print-architecture)
+# TODO: Add a common mysql-client that works for ARM and AMD devices 
 if [ $arch = "amd64" ]; then
     REQUIRED_PKG="mysql-client"
 else
diff --git a/configuration/amd64/mysql/localhost.sql b/configuration/mysql/localhost.sql
similarity index 100%
rename from configuration/amd64/mysql/localhost.sql
rename to configuration/mysql/localhost.sql
diff --git a/configuration/amd64/mysql/port_drayage.sql b/configuration/mysql/port_drayage.sql
similarity index 100%
rename from configuration/amd64/mysql/port_drayage.sql
rename to configuration/mysql/port_drayage.sql
diff --git a/configuration/amd64/mysql/suntrax/README.txt b/configuration/mysql/suntrax/README.txt
similarity index 100%
rename from configuration/amd64/mysql/suntrax/README.txt
rename to configuration/mysql/suntrax/README.txt
diff --git a/configuration/amd64/mysql/suntrax/port_area_operations.sql b/configuration/mysql/suntrax/port_area_operations.sql
similarity index 100%
rename from configuration/amd64/mysql/suntrax/port_area_operations.sql
rename to configuration/mysql/suntrax/port_area_operations.sql
diff --git a/configuration/amd64/mysql/suntrax/staging_area_operations.sql b/configuration/mysql/suntrax/staging_area_operations.sql
similarity index 100%
rename from configuration/amd64/mysql/suntrax/staging_area_operations.sql
rename to configuration/mysql/suntrax/staging_area_operations.sql