diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index da1fd22..3df37eb 100644
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -52,23 +52,16 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Build RPC Plugin
-      id: build_rpc_plugin
+    - name: Build Nakma Plugin
+      id: build_plugin
       uses: josephbmanley/build-nakama-plugin-action@v0.1.1
       with:
         nakamaVersion: "2.12.0"
-        moduleDirectory: server/plugins/world_rpc
-    - name: Build Control Plugin
-      id: build_control_plugin
-      uses: josephbmanley/build-nakama-plugin-action@v0.1.1
-      with:
-        nakamaVersion: "2.12.0"
-        moduleDirectory: server/plugins/control
+        moduleDirectory: server/plugin
     - name: Move Binary
       run: |
         mkdir -p server/data/modules
-        mv ${{ steps.build_rpc_plugin.outputs.binary }} server/data/modules
-        mv ${{ steps.build_control_plugin.outputs.binary }} server/data/modules
+        mv ${{ steps.build_plugin.outputs.binary }} server/data/modules
     - id: get_tag
       name: Get Tag
       env:
diff --git a/.github/workflows/build_stage.yml b/.github/workflows/build_stage.yml
index 2e24b75..3959118 100644
--- a/.github/workflows/build_stage.yml
+++ b/.github/workflows/build_stage.yml
@@ -39,23 +39,16 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Build RPC Plugin
-      id: build_rpc_plugin
+    - name: Build Nakma Plugin
+      id: build_plugin
       uses: josephbmanley/build-nakama-plugin-action@v0.1.1
       with:
         nakamaVersion: "2.12.0"
-        moduleDirectory: server/plugins/world_rpc
-    - name: Build Control Plugin
-      id: build_control_plugin
-      uses: josephbmanley/build-nakama-plugin-action@v0.1.1
-      with:
-        nakamaVersion: "2.12.0"
-        moduleDirectory: server/plugins/control
+        moduleDirectory: server/plugin
     - name: Move Binary
       run: |
         mkdir -p server/data/modules
-        mv ${{ steps.build_rpc_plugin.outputs.binary }} server/data/modules
-        mv ${{ steps.build_control_plugin.outputs.binary }} server/data/modules
+        mv ${{ steps.build_plugin.outputs.binary }} server/data/modules
     - name: Get Docker Repo Name
       id: find_repo
       run: |