diff --git a/.drone.yml b/.drone.yml
index ef2d6a9dc2e..8bcef93de40 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,20 +1,24 @@
+# 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.
+
 kind: pipeline
 type: kubernetes
 name: atlas
 
 steps:
-  - name: docker_atlas_raw_release
-    image: plugins/ecr
-    settings:
-      dockerfile: Dockerfile
-      registry:
-        from_secret: org_ecr_registry
-      repo: atlas
-      tags: ${DRONE_TAG}-atlas-raw
-      region: eu-west-1
-    when:
-      event: tag
-
   - name: docker_atlas_embedded_hbase_solr_release
     image: plugins/ecr
     settings:
@@ -25,6 +29,6 @@ steps:
         from_secret: org_ecr_registry
       region: eu-west-1
       repo: atlas
-      tags: ${DRONE_TAG}-atlas-embedded-hbase-solr
+      tags: 0.0.7-atlas-embedded-hbase-solr
     when:
-      event: tag
+      event: pull_request