diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..08891d8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc5e8c7..74768ec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,8 @@ jobs:
     strategy:
       matrix:
         image: ["swift:5.9", "swift:5.10", "swift:6.0"]
-        
+    container:
+      image: ${{ matrix.image }}
     services:
       redis:
         image: redis
@@ -30,8 +31,6 @@ jobs:
           - 6379:6379
         options: --entrypoint redis-server
 
-    container:
-      image: ${{ matrix.image }}
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -48,4 +47,4 @@ jobs:
     - name: Upload to codecov.io
       uses: codecov/codecov-action@v5
       with:
-        file: info.lcov
+        files: info.lcov
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index bc18a68..fd0cd52 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -12,7 +12,8 @@ jobs:
     strategy:
       matrix:
         image: ['nightly-focal', 'nightly-jammy', 'nightly-amazonlinux2']
-        
+    container:
+      image: swiftlang/swift:${{ matrix.image }}
     services:
       redis:
         image: redis
@@ -20,8 +21,6 @@ jobs:
           - 6379:6379
         options: --entrypoint redis-server
 
-    container:
-      image: swiftlang/swift:${{ matrix.image }}
     steps:
     - name: Checkout
       uses: actions/checkout@v4