diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..ce182cb
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,35 @@
+version: 2.1
+
+orbs:
+  circleci-tools: geos-esm/circleci-tools@0.11.0
+
+workflows:
+  build-test:
+    jobs:
+      - build-GEOSgcm:
+          name: build-GEOSgcm-on-<< matrix.compiler >>
+          matrix:
+            parameters:
+              compiler: [gfortran, ifort]
+          context: 
+            - docker-hub-creds
+
+jobs:
+  build-GEOSgcm:
+    parameters:
+      compiler:
+        type: string
+    executor: circleci-tools/<< parameters.compiler >>
+    working_directory: /root/project
+    steps:
+      - circleci-tools/checkout_fixture
+      - circleci-tools/mepoclone
+      - circleci-tools/mepodevelop
+      - circleci-tools/checkout_if_exists
+      - circleci-tools/cmake:
+          compiler: << parameters.compiler >>
+      - circleci-tools/buildinstall
+      - circleci-tools/compress_artifacts
+      - store_artifacts:
+          path: /logfiles
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de66e25..83b5d25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,5 +3,4 @@ esma_set_this ()
 esma_add_library (${this}
   SRCS GEOS_OceanGridComp.F90
   SUBCOMPONENTS MOM6_GEOSPlug MOM_GEOS5PlugMod GEOSdatasea_GridComp
-  DEPENDENCIES GEOSdatasea_GridComp MAPL
-  INCLUDES ${INC_ESMF})
+  DEPENDENCIES GEOSdatasea_GridComp MAPL esmf)