diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0b3a102..4fdd696 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,14 +2,26 @@
 #
 # Check https://circleci.com/docs/2.0/language-python/ for more details
 #
-version: 2
+version: 2.1
+commands:
+  early_return_for_forked_pull_requests:
+    description: >-
+      If this build is from a fork, stop executing the current job and return success.
+      This is useful to avoid steps that will fail due to missing credentials.
+    steps:
+      - run:
+          name: Early return if this build is from a forked PR
+          command: |
+            if [ -n "$CIRCLE_PR_NUMBER" ]; then
+              echo "Nothing to do for forked PRs, so marking this step successful"
+              circleci step halt
+            fi
 jobs:
   build:
     docker:
       - image: circleci/python:3.6.1
       
       - image: redislabs/redisgraph:edge
-        port: 6379:6379
 
     working_directory: ~/repo
 
@@ -41,8 +53,15 @@ jobs:
           command: |
             . venv/bin/activate
             coverage run test.py
-            codecov 
-        
+
+      - early_return_for_forked_pull_requests
+
+      - run:
+          name: codecove
+          command: |
+            . venv/bin/activate
+            codecov
+
    #   - store_artifacts:
    #       path: test-reports
    #       destination: test-reports