diff --git a/device/blackhole/blackhole_implementation.h b/device/blackhole/blackhole_implementation.h
index 463459387..1b59e6a7a 100644
--- a/device/blackhole/blackhole_implementation.h
+++ b/device/blackhole/blackhole_implementation.h
@@ -74,31 +74,9 @@ static const std::vector<tt_xy_pair> DRAM_CORES = {
      {9, 5},  {9, 7},  {9, 6}
     }};
 
-static constexpr std::array<xy_pair, 24> DRAM_LOCATIONS = {
-    {{0, 0},
-     {0, 1},
-     {0, 11},
-     {0, 2},
-     {0, 10},
-     {0, 3},
-     {0, 9},
-     {0, 4},
-     {0, 8},
-     {0, 5},
-     {0, 7},
-     {0, 6},
-     {9, 0},
-     {9, 1},
-     {9, 11},
-     {9, 2},
-     {9, 10},
-     {9, 3},
-     {9, 9},
-     {9, 4},
-     {9, 8},
-     {9, 5},
-     {9, 7},
-     {9, 6}}};
+// TODO: DRAM locations should be deleted. We keep it for compatibility with
+// the existing code in clients which rely on DRAM_LOCATIONS.
+static const std::vector<tt_xy_pair> DRAM_LOCATIONS = DRAM_CORES;
 
 static constexpr std::array<xy_pair, 1> ARC_LOCATIONS = {{{8, 0}}};
 static constexpr std::array<xy_pair, 1> PCI_LOCATIONS = {{{11, 0}}};
diff --git a/device/grayskull/grayskull_implementation.h b/device/grayskull/grayskull_implementation.h
index f6f44ef72..b57c9e393 100644
--- a/device/grayskull/grayskull_implementation.h
+++ b/device/grayskull/grayskull_implementation.h
@@ -116,7 +116,9 @@ static const std::vector<tt_xy_pair> DRAM_CORES = {{
     {7, 6},
     {10, 0},
     {10, 6}}};
-static const std::array<xy_pair, 8> DRAM_LOCATIONS = {{{1, 6}, {4, 6}, {7, 6}, {10, 6}, {1, 0}, {4, 0}, {7, 0}, {10, 0}}};
+// TODO: DRAM locations should be deleted. We keep it for compatibility with
+// the existing code in clients which rely on DRAM_LOCATIONS.
+static const std::vector<tt_xy_pair> DRAM_LOCATIONS = DRAM_CORES;
 static const std::array<xy_pair, 1> ARC_LOCATIONS = {{{0, 2}}};
 static const std::array<xy_pair, 1> PCI_LOCATIONS = {{{0, 4}}};
 static const std::array<xy_pair, 0> ETH_LOCATIONS = {};
diff --git a/device/wormhole/wormhole_implementation.h b/device/wormhole/wormhole_implementation.h
index 33671b974..0498daaea 100644
--- a/device/wormhole/wormhole_implementation.h
+++ b/device/wormhole/wormhole_implementation.h
@@ -114,25 +114,10 @@ static const std::vector<tt_xy_pair> DRAM_CORES = {
      {5, 7}, {5, 8}, {5, 9},
      {5, 10},{0, 11},{5, 11}}};
 
-static constexpr std::array<xy_pair, 18> DRAM_LOCATIONS = {
-    {{0, 0},
-     {5, 0},
-     {0, 1},
-     {5, 1},
-     {5, 2},
-     {5, 3},
-     {5, 4},
-     {0, 5},
-     {5, 5},
-     {0, 6},
-     {5, 6},
-     {0, 7},
-     {5, 7},
-     {5, 8},
-     {5, 9},
-     {5, 10},
-     {0, 11},
-     {5, 11}}};
+// TODO: DRAM locations should be deleted. We keep it for compatibility with
+// the existing code in clients which rely on DRAM_LOCATIONS.
+static const std::vector<tt_xy_pair> DRAM_LOCATIONS = DRAM_CORES;
+
 static constexpr std::array<xy_pair, 1> ARC_LOCATIONS = {{{0, 2}}};
 static constexpr std::array<xy_pair, 1> PCI_LOCATIONS = {{{0, 4}}};
 static constexpr std::array<xy_pair, 16> ETH_LOCATIONS = {