diff --git a/abap-api-tools/README.md b/abap-api-tools/README.md
index 6ee27912..c77e1136 100644
--- a/abap-api-tools/README.md
+++ b/abap-api-tools/README.md
@@ -37,7 +37,7 @@ With [SAP NWRFC SDK](https://support.sap.com/en/product/connectors/nwrfcsdk.html
 
 Without [SAP NWRFC SDK](https://support.sap.com/en/product/connectors/nwrfcsdk.html), the `make` command and custom ui configurations can be used with [ABAP  annotations sample](https://github.com/SAP/fundamental-tools/tree/sample).
 
-You can also use the [docker image](https://github.com/SAP/fundamental-tools/blob/main/docker/abap-node.Dockerfile), without installing NodeJS or `abap-api-tools` on your notebook:
+You can also use the [docker image](https://github.com/SAP/fundamental-tools/tree/main/docker#abap-api-tools), without installing NodeJS or `abap-api-tools` on your notebook:
 
 ```shell
 docker exec cli abap
diff --git a/docker/README.md b/docker/README.md
index 7c9ddd79..1da108bd 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,13 +1,45 @@
-## docker images for NodeJS and Python RFC Connectivity
+## NodeJS and Python RFC Connectivity
 
 - [Node on Centos](./centos-node.Dockerfile)
 - [Python on Centos](./centos-python.Dockerfile)
 - [python:3.9-slim-buster](./python-39.Dockerfile)
 - [Node/Python on Ubuntu](./ubuntu-test.Dockerfile)
-- [abap-api-tools](./abap-node.Dockerfile)
 
-> SAP NWRFC SDK is not a part of these images and must not distributed with custom images or applications.
+> SAP NWRFC SDK is not a part of these images and must not be packed into externaly distributed images or applications.
 
 Exclusive distribution channel is: [SAP NWRFC SDK on SAP Support Portal](https://launchpad.support.sap.com/#/softwarecenter/template/products/_APP=00200682500000001943&_EVENT=DISPHIER&HEADER=Y&FUNCTIONBAR=N&EVENT=TREE&NE=NAVIGATE&ENR=01200314690100002214&V=MAINT)
 
-More info: https://support.sap.com/en/product/connectors/nwrfcsdk.html
\ No newline at end of file
+More info: https://support.sap.com/en/product/connectors/nwrfcsdk.html
+
+## abap-api-tools
+
+`abap` CLI can run also from docker container, mapped to your local working folder.
+
+Prepare the working directory:
+
+```shell
+mkdir myproject
+cd myproject
+edit sapnwrfc.ini
+```
+
+Docker image with pre-installed SAP NWRFC SDK is available in SAP-internal network only ([link](https://docker.wdf.sap.corp:10443/artifactory/webapp/#/packages/docker/vpcoe~2Fabap-api-tools)).  The local working directory `myproject` must be mapped to docker volume `work`:
+
+```shell
+docker pull docker.wdf.sap.corp:51689/vpcoe/abap-api-tools
+docker run --name cli -it -v <absolute path to>/myproject:/work --env ABAP_API_TOOLS_WORKING_FOLDER=/work docker.wdf.sap.corp:51689/vpcoe/abap-api-tools
+```
+
+The container can be also built from [abap-node.Dockerfile](./abap-node.Dockerfile). SAP NWRFC SDK folder "nwrfcsdk" shall be in that case first copied to Dockerfile folder:
+
+```shell
+docker build --rm --no-cache -t abap-api-tools -f abap-node.Dockerfile .
+docker run --name cli -it -v <path to>/myproject:/work --env ABAP_API_TOOLS_WORKING_FOLDER=/work abap-api-tools
+```
+
+Once the `cli` container is up and running, the `abap` CLI can be invoked:
+
+```shell
+docker start cli
+docker exec cli abap
+```
diff --git a/docker/abap-node.Dockerfile b/docker/abap-node.Dockerfile
index 8d7d3632..3cf7283c 100644
--- a/docker/abap-node.Dockerfile
+++ b/docker/abap-node.Dockerfile
@@ -1,29 +1,8 @@
-# How-to
-#
-# Prepare the working folder with sapnwrfc.ini file:
-#
-#   mkdir mywork
-#   cd mywork
-#   edit sapnwrfc.ini
-#
-# Use the pre-built docker image (SAP internal network only):
-#
-#   docker pull docker.wdf.sap.corp:51689/vpcoe/abap-api-tools
-#   docker run --name cli -it -v <absolute path to>/myapi:/work --env ABAP_API_TOOLS_WORKING_FOLDER=/work docker.wdf.sap.corp:51689/vpcoe/abap-api-tools
-#
-# You can also build the image, using SAP NWRFC SDK downloaded from:
-# - SAP Support Portal (https://support.sap.com/nwrfcsdk) or from
-# - SAP-internal production shares (https://wiki.wdf.sap.corp/wiki/display/PIC/UsingConnectors)
-#
-# To build the image, copy the SAP NWRFC SDK folder "nwrfcsdk" to Dockerfile folder and run:
-#
-#   docker build --rm --no-cache -t abap-api-tools -f abap-node.Dockerfile .
-#   docker run --name cli -it -v <path to>/mywork:/work --env ABAP_API_TOOLS_WORKING_FOLDER=/work abap-api-tools
-#
-# Once the cli container is created and running (docker start cli), the abap CLI can be invoked like:
-#
-#   docker exec cli abap
+# SPDX-FileCopyrightText: 2014 SAP SE Srdjan Boskovic <srdjan.boskovic@sap.com>
 #
+# SPDX-License-Identifier: Apache-2.0
+
+# How-to use: check ./README.md
 
 FROM node:15