diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 633c24dd3ea..7e131a46206 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -1,4 +1,4 @@
-name: Trigger Build on Release and PRs to Main
+name: Build & Release
 
 env:
   OPENBB_ENABLE_QUICK_EXIT: true
@@ -26,30 +26,37 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger Windows Build
-        uses: benc-uk/workflow-dispatch@v1
+        uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: windows10_build.yml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          wait-for-completion-timeout: 2h
   
   trigger-macos-build:
     runs-on: ubuntu-latest
     steps:
-      - name: Trigger Windows Build
-        uses: benc-uk/workflow-dispatch@v1
+      - name: Trigger M1 MacOs Build
+        uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: m1_macos_build.yml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          wait-for-completion-timeout: 2h
   
   trigger-intel-build:
     runs-on: ubuntu-latest
     steps:
-      - name: Trigger Windows Build
-        uses: benc-uk/workflow-dispatch@v1
+      - name: Trigger Intel MacOs Build
+        uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: intel_macos_build.yml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          wait-for-completion-timeout: 2h
   
   trigger-docker-build:
     runs-on: ubuntu-latest
     steps:
-      - name: Trigger Windows Build
-        uses: benc-uk/workflow-dispatch@v1
+      - name: Trigger docker Build
+        uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: docker.yml
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1137494939a..85ad7724476 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -40,4 +40,4 @@ jobs:
       - name: Publishing the Docker image
         run: |
           docker push "${OPENBBTERMINAL_DOCKER_POETRY_IMAGE}"
-        if: startsWith(github.ref, 'refs/heads/main') || startsWith(github.ref, 'refs/heads/release/')
+        if: startsWith(github.ref, 'refs/heads/main')
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 644ec94f7af..cf460b9fbaf 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -1,4 +1,4 @@
-name: Nightly Build on the develop branch
+name: Nightly Build
 
 env:
   OPENBB_ENABLE_QUICK_EXIT: true
@@ -21,30 +21,37 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger Windows Build
-        uses: benc-uk/workflow-dispatch@v1
+        uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: windows10_build.yml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          wait-for-completion-timeout: 2h
   
   trigger-macos-build:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger M1 MacOs Build
-        uses: benc-uk/workflow-dispatch@v1
+        uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: m1_macos_build.yml
-
+          token: ${{ secrets.GITHUB_TOKEN }}
+          wait-for-completion-timeout: 2h
+  
   trigger-intel-build:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger Intel MacOs Build
-        uses: benc-uk/workflow-dispatch@v1
+        uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: intel_macos_build.yml
-
+          token: ${{ secrets.GITHUB_TOKEN }}
+          wait-for-completion-timeout: 2h
+  
   trigger-docker-build:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger docker Build
-        uses: benc-uk/workflow-dispatch@v1
+        uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: docker.yml
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/openbb_terminal/economy/econdb_model.py b/openbb_terminal/economy/econdb_model.py
index 9e277de8531..49936bdcedf 100644
--- a/openbb_terminal/economy/econdb_model.py
+++ b/openbb_terminal/economy/econdb_model.py
@@ -607,6 +607,10 @@ def get_macro_data(
                     f"NEW: {df_new_oldest} - {df_new_newest}"
                 )
 
+        if not df.empty:
+            df = df.groupby(df.index.strftime("%Y-%m")).head(1)
+            df.index = df.index.strftime("%Y-%m")
+
     except HTTPError:
         return console.print(
             f"There is no data available for the combination {parameter} and {country}."
@@ -724,6 +728,7 @@ def get_aggregated_macro_data(
     ).T
 
     (df_rounded, denomination) = transform_by_denomination(country_data_df)
+    df_rounded.index = pd.DatetimeIndex(df_rounded.index)
 
     return (
         df_rounded,