diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 310677023..ed0d083c3 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -61,6 +61,7 @@ jobs:
 
       - name: Run Tests
         run: |
+          export THOR_IMAGE: vechain/thor:${{ github.sha }}
           yarn install
           yarn test:report
 
diff --git a/.idea/aws.xml b/.idea/aws.xml
deleted file mode 100644
index ec328d0bb..000000000
--- a/.idea/aws.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="eu-west-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="eu-west-1" />
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 40b659e30..000000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="ALL" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="fc9fa7d4-7002-40c6-9627-57bd3c454974" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/e2e-tests.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="GOROOT" url="file:///usr/local/go" />
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GitHubPullRequestSearchHistory">{
-  &quot;lastFilter&quot;: {
-    &quot;state&quot;: &quot;OPEN&quot;,
-    &quot;assignee&quot;: &quot;darrenvechain&quot;
-  }
-}</component>
-  <component name="GitToolBoxStore">
-    <option name="projectConfigVersion" value="5" />
-    <option name="recentBranches">
-      <RecentBranches>
-        <option name="branchesForRepo">
-          <list>
-            <RecentBranchesForRepo>
-              <option name="branches">
-                <list>
-                  <RecentBranch>
-                    <option name="branchName" value="integration-tests-2" />
-                    <option name="lastUsedInstant" value="1703588404" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="master" />
-                    <option name="lastUsedInstant" value="1703588398" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="integration-tests" />
-                    <option name="lastUsedInstant" value="1703181116" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="contributing-md-file" />
-                    <option name="lastUsedInstant" value="1703166619" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="docker-security-fix" />
-                    <option name="lastUsedInstant" value="1703163726" />
-                  </RecentBranch>
-                </list>
-              </option>
-              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
-            </RecentBranchesForRepo>
-          </list>
-        </option>
-      </RecentBranches>
-    </option>
-  </component>
-  <component name="GithubPullRequestsUISettings">
-    <option name="selectedUrlAndAccountId">
-      <UrlAndAccount>
-        <option name="accountId" value="8094f00e-5c99-4dd7-bdfc-2622f1944a8a" />
-        <option name="url" value="git@github.com:darrenvechain/thor.git" />
-      </UrlAndAccount>
-    </option>
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="jar://$APPLICATION_HOME_DIR$/plugins/qodana/lib/qodana.jar!/schemas/qodana-yaml-schema.json" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/@types/mocha/index.d.ts" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/@vechain/connex-driver/dist/driver-no-vendor.d.ts" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/@vechain/connex-types/vm.d.ts" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/integration_tests/node_modules/hardhat/src/types/config.ts" root0="SKIP_INSPECTION" />
-    <setting file="file:///usr/local/go/src/math/rand/rand.go" root0="SKIP_INSPECTION" />
-    <setting file="file:///usr/local/go/src/net/http/server.go" root0="SKIP_INSPECTION" />
-    <setting file="file:///usr/local/go/src/runtime/panic.go" root0="SKIP_INSPECTION" />
-    <setting file="https://json.schemastore.org/mocharc.json" root0="SKIP_INSPECTION" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 7
-}</component>
-  <component name="ProjectId" id="2ZOmMW6q4kcwVekgm2Vb5QieGkH" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Docker.integration_tests/docker-compose.yaml: Compose Deployment.executor&quot;: &quot;Run&quot;,
-    &quot;Go Build.go build github.com/vechain/thor/cmd/thor.executor&quot;: &quot;Debug&quot;,
-    &quot;Go Test.TestSeeder_Generate in github.com/vechain/thor/poa.executor&quot;: &quot;Run&quot;,
-    &quot;Jest.Blocks.executor&quot;: &quot;Debug&quot;,
-    &quot;Jest.Blocks.should be able to get the latest block.executor&quot;: &quot;Debug&quot;,
-    &quot;Makefile Target.test-coverage.executor&quot;: &quot;Run&quot;,
-    &quot;Mocha.Accounts.should be able to get a fungible token balance.executor&quot;: &quot;Debug&quot;,
-    &quot;Mocha.Blocks.executor&quot;: &quot;Debug&quot;,
-    &quot;Mocha.Contracts.executor&quot;: &quot;Run&quot;,
-    &quot;Mocha.Contracts.should be able to deploy contract.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.modules.automatic.dependencies.download&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.modules.go.list.on.any.changes.was.set&quot;: &quot;true&quot;,
-    &quot;Vitest.Contracts.should be able to deploy contract.executor&quot;: &quot;Debug&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;integration-tests-2&quot;,
-    &quot;go.import.settings.migrated&quot;: &quot;true&quot;,
-    &quot;go.sdk.automatically.set&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/darren&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs.jest.jest_package&quot;: &quot;/Users/darren/workspace/vechain/thor/integration_tests/node_modules/jest&quot;,
-    &quot;nodejs.mocha.mocha_node_package_dir&quot;: &quot;/Users/darren/workspace/vechain/thor/integration_tests/node_modules/mocha&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;npm.test.executor&quot;: &quot;Debug&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/Users/darren/workspace/vechain/thor/integration_tests/node_modules/typescript/lib&quot;
-  }
-}</component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/integration_tests/keys" />
-      <recent name="$PROJECT_DIR$/.github" />
-      <recent name="$PROJECT_DIR$/api/doc/api-docs" />
-      <recent name="$PROJECT_DIR$/api/doc/swagger-ui" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/integration_tests/network" />
-      <recent name="$PROJECT_DIR$/integration_tests/config" />
-      <recent name="$PROJECT_DIR$/integration_tests" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Mocha.Accounts.should be able to get a fungible token balance">
-    <configuration default="true" type="docker-deploy" factoryName="docker-compose.yml" temporary="true">
-      <deployment type="docker-compose.yml">
-        <settings />
-      </deployment>
-      <method v="2" />
-    </configuration>
-    <configuration name="Accounts.should be able to get a fungible token balance" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>TEST</test-kind>
-      <test-file>$PROJECT_DIR$/integration_tests/test/accounts.test.ts</test-file>
-      <test-names>
-        <name value="Accounts" />
-        <name value="should be able to get a fungible token balance" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="Blocks" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>SUITE</test-kind>
-      <test-file>$PROJECT_DIR$/integration_tests/test/blocks.test.ts</test-file>
-      <test-names>
-        <name value="Blocks" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="Blocks.should be able to fetch finalized block (1)" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package />
-      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options>--require ts-node/register</extra-mocha-options>
-      <test-kind>TEST</test-kind>
-      <test-file>$PROJECT_DIR$/integration_tests/test/blocks.test.ts</test-file>
-      <test-names>
-        <name value="Blocks" />
-        <name value="should be able to fetch finalized block" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="Contracts" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>SUITE</test-kind>
-      <test-file>$PROJECT_DIR$/integration_tests/test/contracts.test.ts</test-file>
-      <test-names>
-        <name value="Contracts" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="Contracts.should be able to deploy contract" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/integration_tests/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$/integration_tests</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>TEST</test-kind>
-      <test-file>$PROJECT_DIR$/integration_tests/test/contracts.test.ts</test-file>
-      <test-names>
-        <name value="Contracts" />
-        <name value="should be able to deploy contract" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <list>
-      <item itemvalue="Mocha.Accounts.should be able to get a fungible token balance" />
-      <item itemvalue="Mocha.Blocks" />
-      <item itemvalue="Mocha.Blocks.should be able to fetch finalized block (1)" />
-      <item itemvalue="Mocha.Contracts" />
-      <item itemvalue="Mocha.Contracts.should be able to deploy contract" />
-    </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Mocha.Accounts.should be able to get a fungible token balance" />
-        <item itemvalue="Mocha.Contracts" />
-        <item itemvalue="Mocha.Contracts.should be able to deploy contract" />
-        <item itemvalue="Mocha.Blocks" />
-        <item itemvalue="Mocha.Blocks.should be able to fetch finalized block (1)" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-gosdk-266795519c66-911b893a1778-org.jetbrains.plugins.go.sharedIndexes.bundled-GO-233.13135.104" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-    <option name="exactExcludedFiles">
-      <list>
-        <option value="$PROJECT_DIR$/integration_tests/test/Lock.js" />
-      </list>
-    </option>
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VgoProject">
-    <settings-migrated>true</settings-migrated>
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/api/blocks/blocks.go</url>
-          <line>121</line>
-          <option name="timeStamp" value="12" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/cmd/thor/flags.go</url>
-          <line>62</line>
-          <option name="timeStamp" value="14" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/api/api.go</url>
-          <line>62</line>
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
-          <url>file://$PROJECT_DIR$/api/api.go</url>
-          <line>61</line>
-          <option name="timeStamp" value="22" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/integration_tests/test/setup/connex.ts</url>
-          <line>49</line>
-          <option name="timeStamp" value="28" />
-        </line-breakpoint>
-      </breakpoints>
-      <default-breakpoints>
-        <breakpoint type="DlvErrorBreakpoint" />
-      </default-breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="../../../../workspace/vechain/thor/coverage.out" NAME="coverage.out" MODIFIED="1703150194183" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="GoCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-  </component>
-</project>
\ No newline at end of file