diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..660286b03
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+*.o
+*.so
+.gitignore
+build.sh
+.idea
+.deps
+.DS_Store
+*.tokens
+*.interp
\ No newline at end of file
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from Dockerfile
rename to docker/Dockerfile
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
new file mode 100644
index 000000000..fe40788e7
--- /dev/null
+++ b/docker/Dockerfile.dev
@@ -0,0 +1,42 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+FROM postgres:13-buster
+
+RUN apt-get update
+RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests \
+  bison \
+  build-essential \
+  flex \
+  postgresql-server-dev-13
+
+COPY . /age
+
+# Set current working directory to /age/ and build.
+WORKDIR /age
+RUN make install
+
+RUN chown -R postgres /age
+USER postgres
+
+RUN make installcheck
+
+COPY docker/docker-entrypoint-initdb.d/00-create-extension-age.sql /docker-entrypoint-initdb.d/00-create-extension-age.sql
+
+CMD ["postgres", "-c", "shared_preload_libraries=age"]
diff --git a/docker-entrypoint-initdb.d/00-create-extension-age.sql b/docker/docker-entrypoint-initdb.d/00-create-extension-age.sql
similarity index 100%
rename from docker-entrypoint-initdb.d/00-create-extension-age.sql
rename to docker/docker-entrypoint-initdb.d/00-create-extension-age.sql