diff --git a/src/main/java/com/netflix/simianarmy/aws/janitor/crawler/edda/EddaEBSVolumeJanitorCrawler.java b/src/main/java/com/netflix/simianarmy/aws/janitor/crawler/edda/EddaEBSVolumeJanitorCrawler.java
index 3685f624..8f4f47b3 100644
--- a/src/main/java/com/netflix/simianarmy/aws/janitor/crawler/edda/EddaEBSVolumeJanitorCrawler.java
+++ b/src/main/java/com/netflix/simianarmy/aws/janitor/crawler/edda/EddaEBSVolumeJanitorCrawler.java
@@ -96,9 +96,9 @@ private void updateInstanceToOwner(String region) {
         LOGGER.info(String.format("Getting owners for all instances in region %s", region));
 
         long startTime = DateTime.now().minusDays(LOOKBACK_DAYS).getMillis();
-        String url = String.format("%s/view/instances;_since=%d;state.name=running;tags.key=owner;"
+        String url = String.format("%1$s/view/instances;_since=%2$d;state.name=running;tags.key=%3$s;"
                 + "_expand:(instanceId,tags:(key,value))",
-                eddaClient.getBaseUrl(region), startTime);
+                eddaClient.getBaseUrl(region), startTime, BasicSimianArmyContext.GLOBAL_OWNER_TAGKEY);
         JsonNode jsonNode = null;
         try {
             jsonNode = eddaClient.getJsonNodeFromUrl(url);
diff --git a/src/main/java/com/netflix/simianarmy/aws/janitor/crawler/edda/EddaInstanceJanitorCrawler.java b/src/main/java/com/netflix/simianarmy/aws/janitor/crawler/edda/EddaInstanceJanitorCrawler.java
index efcc35cf..9e0f5e54 100644
--- a/src/main/java/com/netflix/simianarmy/aws/janitor/crawler/edda/EddaInstanceJanitorCrawler.java
+++ b/src/main/java/com/netflix/simianarmy/aws/janitor/crawler/edda/EddaInstanceJanitorCrawler.java
@@ -242,7 +242,7 @@ private void refreshOwnerByImage(String region, List<Resource> resources) {
             HashMap<String, String> imageToOwner = new HashMap<String, String>();
             String url = eddaClient.getBaseUrl(region) + "/aws/images/";
             url += StringUtils.join(imageIds, ',');
-            url += ";tags.key=owner;public=false;_expand:(imageId,tags:(owner))";
+            url += String.format(";tags.key=%1$s;public=false;_expand:(imageId,tags:(%1$s))", BasicSimianArmyContext.GLOBAL_OWNER_TAGKEY);
             JsonNode imageJsonNode = null;
             try {
                 imageJsonNode = eddaClient.getJsonNodeFromUrl(url);